diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed3a3675a12f6f21fde2d43cf73062ff62701277..638c0aa69c5b6c9e0c1bdc4b380eddcd1c3068fa 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,7 +93,7 @@ linux-snap: paths: - scripts/parity_*_amd64.snap name: "stable-x86_64-unknown-snap-gnu_parity" - allow_failure: true + allow_failure: true linux-stable-debian: stage: build image: parity/rust-debian:gitlab-ci @@ -244,7 +244,7 @@ linux-i686: - strip target/$PLATFORM/release/parity - strip target/$PLATFORM/release/parity-evm - strip target/$PLATFORM/release/ethstore - - strip target/$PLATFORM/release/ethkey + - strip target/$PLATFORM/release/ethkey - strip target/$PLATFORM/release/parity - md5sum target/$PLATFORM/release/parity > parity.md5 - export SHA3=$(target/$PLATFORM/release/parity tools hash target/$PLATFORM/release/parity) @@ -627,8 +627,12 @@ js-test: - git submodule update --init --recursive - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l) - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi + - export JS_OLD_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js-old/ | wc -l) + - if [ $JS_OLD_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS (old) deps install since no JS files modified."; else ./js-old/scripts/install-deps.sh;fi + script: - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS lint since no JS files modified."; else ./js/scripts/lint.sh && ./js/scripts/test.sh && ./js/scripts/build.sh; fi + - if [ $JS_OLD_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS (old) lint since no JS files modified."; else ./js-old/scripts/lint.sh && ./js-old/scripts/test.sh && ./js-old/scripts/build.sh; fi tags: - rust - rust-stable @@ -679,10 +683,17 @@ js-release: - export JS_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js/ | wc -l) - echo $JS_FILES_MODIFIED - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS deps install since no JS files modified."; else ./js/scripts/install-deps.sh;fi + - export JS_OLD_FILES_MODIFIED=$(git --no-pager diff --name-only $CI_BUILD_REF^ $CI_BUILD_REF | grep ^js-old/ | wc -l) + - echo $JS_OLD_FILES_MODIFIED + - if [ $JS_OLD_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS (old) deps install since no JS files modified."; else ./js-old/scripts/install-deps.sh;fi + script: - rustup default stable - echo $JS_FILES_MODIFIED - if [ $JS_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS rebuild since no JS files modified."; else ./js/scripts/build.sh && ./js/scripts/release.sh; fi + - echo $JS_OLD_FILES_MODIFIED + - if [ $JS_OLD_FILES_MODIFIED -eq 0 ]; then echo "Skipping JS (old) rebuild since no JS files modified."; else ./js-old/scripts/build.sh && ./js-old/scripts/release.sh; fi + tags: - javascript push-release: diff --git a/CHANGELOG.md b/CHANGELOG.md index be69da8db1381a5be648568322748aef3aca13a6..b3695b06a26f6e3d1709981766202c7a5bd1573d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,25 +1,32 @@ -## Parity [v1.8.0](https://github.com/paritytech/parity/releases/tag/v1.8.0) (2017-10-13) +## Parity [v1.8.0](https://github.com/paritytech/parity/releases/tag/v1.8.0) (2017-10-15) -@TODO describe and document +We are happy to announce our newest Parity 1.8 release. Among others, it enables the following features: -- WASM contracts -- light cient improvements (POA chain compatibility) -- Trezor wallet support -- Abstraction of engine: Generalize engine trait, Move more params to the common section -- PICOPS certification badge -- Vouch for Dapps -- Premissioned p2p-connections -- Transaction permissioning -- Add Musicoin and MCIP-3 UBI hardfork. -- Add pagination for trace_filter rpc method -- Rename network_id to chain_id where applicable -- Compatibility with whisper v6 -- Byzantium updates -- Rewards on closing blocks +- Full Whisper v6 integration +- Trezor hardware-wallet support +- WASM contract support +- PICOPS KYC-certified accounts and vouching for community-dapps +- Light client compatibility for Proof-of-Authority networks +- Transaction permissioning and permissioned p2p-connections +- Full Byzantium-fork compatibility +- Full Musicoin MCIP-3 UBI-fork compatibility + +Further, users upgrading from 1.7 should acknowledge the following changes: + +- The chain-engine was further abstracted and chain-specs need to be upgraded. [#6134](https://github.com/paritytech/parity/pull/6134) [#6591](https://github.com/paritytech/parity/pull/6591) +- `network_id` was renamed to `chain_id` where applicable. [#6345](https://github.com/paritytech/parity/pull/6345) +- `trace_filter` RPC method now comes with pagination. [#6312](https://github.com/paritytech/parity/pull/6312) +- Added tracing of rewards on closing blocks. [#6194](https://github.com/paritytech/parity/pull/6194) Full list of included changes: -- CLI: Reject invalid argument values rather than ignore them (#6747) +- Updated ethabi to fix auto-update ([#6771](https://github.com/paritytech/parity/pull/6771)) +- Fixed kovan chain validation ([#6760](https://github.com/paritytech/parity/pull/6760)) + - Fixed kovan chain validation + - Fork detection + - Fixed typo +- Bumped fork block number for auto-update ([#6755](https://github.com/paritytech/parity/pull/6755)) +- CLI: Reject invalid argument values rather than ignore them ([#6747](https://github.com/paritytech/parity/pull/6747)) - Fixed modexp gas calculation overflow ([#6745](https://github.com/paritytech/parity/pull/6745)) - Backport beta - Fixes Badges ([#6732](https://github.com/paritytech/parity/pull/6732)) - Fix badges not showing up ([#6730](https://github.com/paritytech/parity/pull/6730)) diff --git a/Cargo.lock b/Cargo.lock index 95b19ce352f1cbc4e79ebc82e4586503be065738..b384332449b79812f1d3468d794128201a9d1136 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -233,16 +233,6 @@ dependencies = [ "iovec 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "cargo_metadata" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "cc" version = "1.0.0" @@ -287,14 +277,6 @@ dependencies = [ "vec_map 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "clippy" -version = "0.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "clippy_lints 0.0.90 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "clippy" version = "0.0.103" @@ -303,29 +285,6 @@ dependencies = [ "clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "clippy" -version = "0.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy_lints 0.0.163 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "clippy_lints" -version = "0.0.90" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.1.30 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "clippy_lints" version = "0.0.103" @@ -340,24 +299,6 @@ dependencies = [ "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "clippy_lints" -version = "0.0.163" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "itertools 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "matches 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "quine-mc_cluskey 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", - "toml 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "coco" version = "0.1.1" @@ -542,9 +483,10 @@ dependencies = [ [[package]] name = "ethabi" -version = "2.0.0" +version = "4.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -583,9 +525,6 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", "ethcore-io 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", "ethcore-logger 1.9.0", "ethcore-stratum 1.9.0", "ethcore-util 1.9.0", @@ -600,12 +539,16 @@ dependencies = [ "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.10.0-a.0 (git+https://github.com/paritytech/hyper)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", + "journaldb 0.1.0", "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", + "kvdb-rocksdb 0.1.0", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "linked-hash-map 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", + "memory-cache 0.1.0", "memorydb 0.1.0", "migration 0.1.0", "native-contracts 0.1.0", @@ -676,68 +619,6 @@ dependencies = [ "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ethcore-ipc" -version = "1.9.0" -dependencies = [ - "ethcore-bigint 0.1.3", - "ethcore-devtools 1.9.0", - "ethcore-util 1.9.0", - "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)", - "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethcore-ipc-codegen" -version = "1.9.0" -dependencies = [ - "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy 0.0.163 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethcore-ipc-hypervisor" -version = "1.2.0" -dependencies = [ - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)", - "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "ethcore-ipc-nano" -version = "1.9.0" -dependencies = [ - "ethcore-ipc 1.9.0", - "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)", -] - -[[package]] -name = "ethcore-ipc-tests" -version = "0.1.0" -dependencies = [ - "ethcore-bytes 0.1.0", - "ethcore-devtools 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", - "ethcore-util 1.9.0", - "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)", - "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ethcore-light" version = "1.9.0" @@ -748,8 +629,6 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", "ethcore-io 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", "ethcore-network 1.9.0", "ethcore-util 1.9.0", "evm 0.1.0", @@ -758,7 +637,10 @@ dependencies = [ "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", + "kvdb-rocksdb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "memory-cache 0.1.0", "memorydb 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "patricia_trie 0.1.0", @@ -818,6 +700,8 @@ dependencies = [ "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde_json 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "snappy 0.1.0", + "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", "time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)", "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -827,14 +711,10 @@ name = "ethcore-secretstore" version = "1.0.0" dependencies = [ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.9.0", "ethcore-bigint 0.1.3", "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", "ethcore-logger 1.9.0", "ethcore-util 1.9.0", "ethcrypto 0.1.0", @@ -844,6 +724,7 @@ dependencies = [ "hash 0.1.0", "hyper 0.10.13 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0", + "kvdb-rocksdb 0.1.0", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "native-contracts 0.1.0", @@ -867,9 +748,6 @@ dependencies = [ "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.1.3", "ethcore-devtools 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", "ethcore-logger 1.9.0", "ethcore-util 1.9.0", "hash 0.1.0", @@ -889,19 +767,18 @@ dependencies = [ "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)", "ethcore-bigint 0.1.3", "ethcore-bytes 0.1.0", - "ethcore-devtools 1.9.0", "ethcore-logger 1.9.0", "hash 0.1.0", "hashdb 0.1.0", "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "journaldb 0.1.0", "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", - "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "memorydb 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "patricia_trie 0.1.0", @@ -1013,9 +890,6 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", "ethcore-io 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-ipc-nano 1.9.0", "ethcore-light 1.9.0", "ethcore-network 1.9.0", "ethcore-util 1.9.0", @@ -1024,6 +898,7 @@ dependencies = [ "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1047,6 +922,7 @@ dependencies = [ "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "memory-cache 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "vm 0.1.0", @@ -1351,17 +1227,6 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "ipc-common-types" -version = "1.9.0" -dependencies = [ - "ethcore-bigint 0.1.3", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", - "ethcore-util 1.9.0", - "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ipnetwork" version = "0.12.7" @@ -1385,19 +1250,30 @@ dependencies = [ "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "itertools" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "either 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "itoa" version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "journaldb" +version = "0.1.0" +dependencies = [ + "ethcore-bigint 0.1.3", + "ethcore-bytes 0.1.0", + "ethcore-logger 1.9.0", + "hash 0.1.0", + "hashdb 0.1.0", + "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", + "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", + "memorydb 0.1.0", + "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rlp 0.2.0", + "util-error 0.1.0", +] + [[package]] name = "jsonrpc-core" version = "8.0.0" @@ -1508,15 +1384,31 @@ version = "0.1.0" dependencies = [ "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethcore-bigint 0.1.3", "ethcore-bytes 0.1.0", - "ethcore-devtools 1.9.0", - "hashdb 0.1.0", +] + +[[package]] +name = "kvdb-memorydb" +version = "0.1.0" +dependencies = [ + "kvdb 0.1.0", + "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rlp 0.2.0", +] + +[[package]] +name = "kvdb-rocksdb" +version = "0.1.0" +dependencies = [ + "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethcore-bigint 0.1.3", + "kvdb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", "rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)", + "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1645,6 +1537,14 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "memory-cache" +version = "0.1.0" +dependencies = [ + "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "memorydb" version = "0.1.0" @@ -1662,10 +1562,12 @@ dependencies = [ name = "migration" version = "0.1.0" dependencies = [ - "ethcore-devtools 1.9.0", + "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "kvdb 0.1.0", + "kvdb-rocksdb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", + "tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1781,29 +1683,11 @@ dependencies = [ "tiny-keccak 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nanomsg" -version = "0.5.1" -source = "git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7#673b79beef6e149273899850d7692335a481a920" -dependencies = [ - "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", - "nanomsg-sys 0.5.0 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)", -] - -[[package]] -name = "nanomsg-sys" -version = "0.5.0" -source = "git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7#673b79beef6e149273899850d7692335a481a920" -dependencies = [ - "gcc 0.3.54 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "native-contract-generator" version = "0.1.0" dependencies = [ - "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "heck 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1812,7 +1696,7 @@ name = "native-contracts" version = "0.1.0" dependencies = [ "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.1.3", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "native-contract-generator 0.1.0", @@ -1853,7 +1737,7 @@ dependencies = [ "ethcore-network 1.9.0", "ethcore-util 1.9.0", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "native-contracts 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2050,7 +1934,7 @@ dependencies = [ [[package]] name = "parity" -version = "1.8.0" +version = "1.9.0" dependencies = [ "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2065,10 +1949,6 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", "ethcore-io 1.9.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-hypervisor 1.2.0", - "ethcore-ipc-nano 1.9.0", - "ethcore-ipc-tests 0.1.0", "ethcore-light 1.9.0", "ethcore-logger 1.9.0", "ethcore-network 1.9.0", @@ -2083,8 +1963,10 @@ dependencies = [ "hash 0.1.0", "ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)", "isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", + "journaldb 0.1.0", "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)", "kvdb 0.1.0", + "kvdb-rocksdb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "migration 0.1.0", "node-filter 1.9.0", @@ -2106,7 +1988,7 @@ dependencies = [ "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "regex 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", - "rpassword 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "rpc-cli 1.4.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2142,7 +2024,7 @@ dependencies = [ "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "node-health 0.1.0", - "parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.9.0", "parity-reactor 0.1.0", "parity-ui 1.9.0", @@ -2158,14 +2040,15 @@ dependencies = [ [[package]] name = "parity-dapps-glue" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" +version = "1.9.0" dependencies = [ "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", + "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_macros 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2173,14 +2056,13 @@ dependencies = [ [[package]] name = "parity-dapps-glue" version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", - "clippy 0.0.90 (registry+https://github.com/rust-lang/crates.io-index)", "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_macros 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2189,7 +2071,7 @@ dependencies = [ name = "parity-hash-fetch" version = "1.9.0" dependencies = [ - "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.1.3", "ethcore-bytes 0.1.0", "ethcore-util 1.9.0", @@ -2231,6 +2113,7 @@ dependencies = [ "ethcore-util 1.9.0", "ethkey 0.2.0", "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "rlp 0.2.0", "serde 1.0.15 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2267,7 +2150,6 @@ dependencies = [ "ethcore-bytes 0.1.0", "ethcore-devtools 1.9.0", "ethcore-io 1.9.0", - "ethcore-ipc 1.9.0", "ethcore-light 1.9.0", "ethcore-logger 1.9.0", "ethcore-network 1.9.0", @@ -2278,6 +2160,7 @@ dependencies = [ "ethstore 0.1.0", "ethsync 1.9.0", "fetch 0.1.0", + "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", "hardware-wallet 1.9.0", "hash 0.1.0", @@ -2288,7 +2171,7 @@ dependencies = [ "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)", "jsonrpc-pubsub 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)", "jsonrpc-ws-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)", - "kvdb 0.1.0", + "kvdb-memorydb 0.1.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "macros 0.1.0", "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2352,6 +2235,8 @@ name = "parity-ui" version = "1.9.0" dependencies = [ "parity-ui-dev 1.9.0", + "parity-ui-old-dev 1.9.0", + "parity-ui-old-precompiled 1.8.0 (git+https://github.com/paritytech/js-precompiled.git?branch=v1)", "parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git)", "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2360,36 +2245,49 @@ dependencies = [ name = "parity-ui-dev" version = "1.9.0" dependencies = [ - "parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "parity-ui-old-dev" +version = "1.9.0" +dependencies = [ + "parity-dapps-glue 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "parity-ui-old-precompiled" +version = "1.8.0" +source = "git+https://github.com/paritytech/js-precompiled.git?branch=v1#94b0a89aac7eb5ddfdb53cd9bb039da6fdbf7583" +dependencies = [ + "parity-dapps-glue 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-ui-precompiled" version = "1.4.0" -source = "git+https://github.com/paritytech/js-precompiled.git#4b77a23c3e55aed45725f43cd2a499676375b995" +source = "git+https://github.com/paritytech/js-precompiled.git#29360e67331334a9ec3aafdb3725d8f7d8b5d2a1" dependencies = [ - "parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parity-updater" version = "1.9.0" dependencies = [ - "ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore 1.9.0", "ethcore-bigint 0.1.3", "ethcore-bytes 0.1.0", - "ethcore-ipc 1.9.0", - "ethcore-ipc-codegen 1.9.0", "ethcore-util 1.9.0", "ethsync 1.9.0", "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", - "ipc-common-types 1.9.0", "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)", "parity-hash-fetch 1.9.0", "parity-reactor 0.1.0", "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "path 0.1.0", + "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2615,15 +2513,6 @@ dependencies = [ "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "pulldown-cmark" -version = "0.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "quasi" version = "0.32.0" @@ -2818,23 +2707,12 @@ dependencies = [ [[package]] name = "rpassword" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", - "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "rpassword" -version = "0.3.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", - "termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rprompt 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2847,9 +2725,14 @@ dependencies = [ "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)", "parity-rpc 1.9.0", "parity-rpc-client 1.4.0", - "rpassword 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "rprompt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "rust-crypto" version = "0.2.36" @@ -3229,14 +3112,6 @@ dependencies = [ "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "termios" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "textwrap" version = "0.8.0" @@ -3514,6 +3389,7 @@ version = "0.1.0" dependencies = [ "error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "ethcore-bigint 0.1.3", + "kvdb 0.1.0", "rlp 0.2.0", "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -3681,17 +3557,12 @@ dependencies = [ "checksum byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "0fc10e8cc6b2580fda3f36eb6dc5316657f812a3df879a44a66fc9f0fdbc4855" "checksum byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff81738b726f5d099632ceaffe7fb65b90212e8dce59d518729e7e8634032d3d" "checksum bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d828f97b58cc5de3e40c421d0cf2132d6b2da4ee0e11b8632fa838f0f9333ad6" -"checksum cargo_metadata 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "be1057b8462184f634c3a208ee35b0f935cfd94b694b26deadccd98732088d7b" "checksum cc 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7db2f146208d7e0fbee761b09cd65a7f51ccc38705d4e7262dad4d73b12a76b1" "checksum cfg-if 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d4c819a1287eb618df47cc647173c5c4c66ba19d888a6e50d605672aed3140de" "checksum cid 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "34aa7da06f10541fbca6850719cdaa8fa03060a5d2fb33840f149cf8133a00c7" "checksum clap 2.26.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3451e409013178663435d6f15fdb212f14ee4424a3d74f979d081d0a66b6f1f2" "checksum clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "5b4fabf979ddf6419a313c1c0ada4a5b95cfd2049c56e8418d622d27b4b6ff32" -"checksum clippy 0.0.163 (registry+https://github.com/rust-lang/crates.io-index)" = "5ad3f3dc94d81a6505eb28bf545b501fc9d7525ee9864df5a4b2b6d82629f038" -"checksum clippy 0.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "d19bda68c3db98e3a780342f6101b44312fef20a5f13ce756d1202a35922b01b" "checksum clippy_lints 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)" = "ce96ec05bfe018a0d5d43da115e54850ea2217981ff0f2e462780ab9d594651a" -"checksum clippy_lints 0.0.163 (registry+https://github.com/rust-lang/crates.io-index)" = "c058b299bb1289c7e8c063bd49477715c91cb3c3344bcf2e25326860b0675654" -"checksum clippy_lints 0.0.90 (registry+https://github.com/rust-lang/crates.io-index)" = "3d4ed67c69b9bb35169be2538691d290a3aa0cbfd4b9f0bfb7c221fc1d399a96" "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 cookie 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d53b80dde876f47f03cda35303e368a79b91c70b0d65ecba5fd5280944a08591" @@ -3713,7 +3584,7 @@ dependencies = [ "checksum error-chain 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ff511d5dc435d703f4971bc399647c9bc38e20cb41452e3b9feb4765419ed3f3" "checksum error-chain 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd5c82c815138e278b8dcdeffc49f27ea6ffb528403e9dea4194f2e3dd40b143" "checksum eth-secp256k1 0.5.6 (git+https://github.com/paritytech/rust-secp256k1)" = "" -"checksum ethabi 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c3d62319ee0f35abf20afe8859dd2668195912614346447bb2dee9fb8da7c62" +"checksum ethabi 4.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c819a3adef0413a2519cbd9a19a35dd1c20c7a0110705beaba8aa4aa87eda95f" "checksum fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ee15a7050e5580b3712877157068ea713b245b080ff302ae2ca973cfcd9baa" "checksum flate2 0.2.20 (registry+https://github.com/rust-lang/crates.io-index)" = "e6234dd4468ae5d1e2dbb06fe2b058696fdc50a339c68a393aefbf00bc81e423" "checksum fnv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6cc484842f1e2884faf56f529f960cc12ad8c71ce96cc7abba0a067c98fee344" @@ -3742,7 +3613,6 @@ dependencies = [ "checksum ipnetwork 0.12.7 (registry+https://github.com/rust-lang/crates.io-index)" = "2134e210e2a024b5684f90e1556d5f71a1ce7f8b12e9ac9924c67fb36f63b336" "checksum isatty 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fa500db770a99afe2a0f2229be2a3d09c7ed9d7e4e8440bf71253141994e240f" "checksum itertools 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4833d6978da405305126af4ac88569b5d71ff758581ce5a987dbfa3755f694fc" -"checksum itertools 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4d6a273c31ef276c917019239588b23bc696f277af8db10742cba3c27ec2f0" "checksum itoa 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8324a32baf01e2ae060e9de58ed0bc2320c9a2833491ee36cd3b4c414de4db8c" "checksum jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)" = "" "checksum jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)" = "" @@ -3781,8 +3651,6 @@ dependencies = [ "checksum msdos_time 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "65ba9d75bcea84e07812618fedf284a64776c2f2ea0cad6bca7f69739695a958" "checksum multibase 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b9c35dac080fd6e16a99924c8dfdef0af89d797dd851adab25feaffacf7850d6" "checksum multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d14363c7695e2e5adbbb8fe139d806a19b8b13f02b9b1fb770fab0c12edaff58" -"checksum nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)" = "" -"checksum nanomsg-sys 0.5.0 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)" = "" "checksum native-tls 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "04b781c9134a954c84f0594b9ab3f5606abc516030388e8511887ef4c204a1e5" "checksum net2 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)" = "3a80f842784ef6c9a958b68b7516bc7e35883c614004dd94959a4dca1b716c09" "checksum nodrop 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "52cd74cd09beba596430cc6e3091b74007169a56246e1262f0ba451ea95117b2" @@ -3804,8 +3672,9 @@ dependencies = [ "checksum order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "efa535d5117d3661134dbf1719b6f0ffe06f2375843b13935db186cd094105eb" "checksum ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58d25b6c0e47b20d05226d288ff434940296e7e2f8b877975da32f862152241f" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" -"checksum parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ddaeb8543c6823e93dae65a25eb8083ebfeee8f0000031119d7a0055b2e8fc63" +"checksum parity-dapps-glue 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9df5504a83dbbbd25ddb0645372bd09dff5a7716e18690a21211873b81606fe9" "checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "" +"checksum parity-ui-old-precompiled 1.8.0 (git+https://github.com/paritytech/js-precompiled.git?branch=v1)" = "" "checksum parity-ui-precompiled 1.4.0 (git+https://github.com/paritytech/js-precompiled.git)" = "" "checksum parity-wasm 0.14.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4502e18417d96bd8e72fca9ea4cc18f4d80288ff565582d10aefe86f18b4fc3" "checksum parity-wordlist 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "81451bfab101d186f8fc4a0aa13cb5539b31b02c4ed96425a0842e2a413daba6" @@ -3825,7 +3694,6 @@ dependencies = [ "checksum primal-estimate 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "56ea4531dde757b56906493c8604641da14607bf9cdaa80fb9c9cabd2429f8d5" "checksum primal-sieve 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "e058e7a369c70c0103d138ef71f052a48b102592aadb8ca38ee80d85d303e1de" "checksum protobuf 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "568a15e4d572d9a5e63ae3a55f84328c984842887db179b40b4cc6a608bac6a4" -"checksum pulldown-cmark 0.0.15 (registry+https://github.com/rust-lang/crates.io-index)" = "378e941dbd392c101f2cb88097fa4d7167bc421d4b88de3ff7dbee503bc3233b" "checksum pulldown-cmark 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8361e81576d2e02643b04950e487ec172b687180da65c731c03cf336784e6c07" "checksum quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "18c45c4854d6d1cf5d531db97c75880feb91c958b0720f4ec1057135fec358b3" "checksum quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51b9e25fa23c044c1803f43ca59c98dac608976dd04ce799411edd58ece776d4" @@ -3846,8 +3714,8 @@ dependencies = [ "checksum rocksdb 0.4.5 (git+https://github.com/paritytech/rust-rocksdb)" = "" "checksum rocksdb-sys 0.3.0 (git+https://github.com/paritytech/rust-rocksdb)" = "" "checksum rotor 0.6.3 (git+https://github.com/tailhook/rotor)" = "" -"checksum rpassword 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "320da1dfcf5c570a6c07ff60bb7cd4cdc986d2ea89caea139f2247371ab6a1df" -"checksum rpassword 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ec4bdede957362ec6fdd550f7e79c6d14cad2bc26b2d062786234c6ee0cb27bb" +"checksum rpassword 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b273c91bd242ca03ad6d71c143b6f17a48790e61f21a6c78568fa2b6774a24a4" +"checksum rprompt 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1601f32bc5858aae3cbfa1c645c96c4d820cc5c16be0194f089560c00b6eb625" "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a" "checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e" "checksum rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0ceb8ce7a5e520de349e1fa172baeba4a9e8d5ef06c47471863530bc4972ee1e" @@ -3895,7 +3763,6 @@ dependencies = [ "checksum tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "87974a6f5c1dfb344d733055601650059a3363de2a6104819293baff662132d6" "checksum term 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fa63644f74ce96fbeb9b794f66aff2a52d601cbd5e80f4b97123e3899f4570f1" "checksum term_size 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2b6b55df3198cc93372e85dd2ed817f0e38ce8cc0f22eb32391bfad9c4bf209" -"checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a" "checksum textwrap 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8e08afc40ae3459e4838f303e465aa50d823df8d7f83ca88108f6d3afe7edd" "checksum thread_local 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "1697c4b57aeeb7a536b647165a2825faddffb1d3bad386d507709bd51a90bb14" "checksum time 0.1.38 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d788d3aa77bc0ef3e9621256885555368b47bd495c13dd2e7413c89f845520" diff --git a/Cargo.toml b/Cargo.toml index cf208330d3eb3173db2db2c03c0fa8604c832d08..a953dcef86c80eb1ec5a59a7b40d8af8c33b7f6f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] description = "Parity Ethereum client" name = "parity" -version = "1.8.0" +version = "1.9.0" license = "GPL-3.0" authors = ["Parity Technologies "] build = "build.rs" @@ -15,7 +15,7 @@ clap = "2" time = "0.1" num_cpus = "1.2" number_prefix = "0.2" -rpassword = "0.2.1" +rpassword = "1.0" semver = "0.6" ansi_term = "0.9" parking_lot = "0.4" @@ -39,9 +39,6 @@ ethcore-bytes = { path = "util/bytes" } ethcore-bigint = { path = "util/bigint" } ethcore-io = { path = "util/io" } ethcore-devtools = { path = "devtools" } -ethcore-ipc = { path = "ipc/rpc" } -ethcore-ipc-nano = { path = "ipc/nano" } -ethcore-ipc-hypervisor = { path = "ipc/hypervisor" } ethcore-light = { path = "ethcore/light" } ethcore-logger = { path = "logger" } ethcore-stratum = { path = "stratum" } @@ -64,6 +61,8 @@ panic_hook = { path = "panic_hook" } hash = { path = "util/hash" } migration = { path = "util/migration" } kvdb = { path = "util/kvdb" } +kvdb-rocksdb = { path = "util/kvdb-rocksdb" } +journaldb = { path = "util/journaldb" } parity-dapps = { path = "dapps", optional = true } clippy = { version = "0.0.103", optional = true} @@ -73,7 +72,6 @@ ethcore-secretstore = { path = "secret_store", optional = true } rustc_version = "0.2" [dev-dependencies] -ethcore-ipc-tests = { path = "ipc/tests" } pretty_assertions = "0.1" ipnetwork = "0.12.6" @@ -95,7 +93,6 @@ ui-precompiled = [ ] ui-enabled = ["dapps"] dapps = ["parity-dapps"] -ipc = ["ethcore/ipc", "ethsync/ipc"] jit = ["ethcore/jit"] dev = ["clippy", "ethcore/dev", "ethcore-util/dev", "ethsync/dev", "parity-rpc/dev", "parity-dapps/dev"] json-tests = ["ethcore/json-tests"] diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index f3e38a0850634d448a58e03388f13a2258a67c2f..c0e856791a7dbe9a6dc99af7c9792817c00e7b30 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -13,7 +13,7 @@ futures = "0.1" futures-cpupool = "0.1" linked-hash-map = "0.5" log = "0.3" -parity-dapps-glue = "1.8" +parity-dapps-glue = "1.9" parking_lot = "0.4" mime_guess = "2.0.0-alpha.2" rand = "0.3" diff --git a/dapps/js-glue/Cargo.toml b/dapps/js-glue/Cargo.toml index 843168fb7b57a681b6e86253a7d60d60d396a456..76c5457d74503e29fc5d8e44c458f5b196f88aac 100644 --- a/dapps/js-glue/Cargo.toml +++ b/dapps/js-glue/Cargo.toml @@ -18,7 +18,7 @@ quasi = { version = "0.32", default-features = false } quasi_macros = { version = "0.32", optional = true } syntex = { version = "0.58", optional = true } syntex_syntax = { version = "0.58", optional = true } -clippy = { version = "0.0.90", optional = true } +clippy = { version = "0.0.103", optional = true } [features] dev = ["clippy"] diff --git a/dapps/src/apps/mod.rs b/dapps/src/apps/mod.rs index 8467a8e71c4c5bc8bbff31b49e0d84cfa364b2ad..e7657736d1841ff5a85047d4020478ccdcee389e 100644 --- a/dapps/src/apps/mod.rs +++ b/dapps/src/apps/mod.rs @@ -77,6 +77,9 @@ pub fn all_endpoints( // NOTE [ToDr] Dapps will be currently embeded on 8180 insert::(&mut pages, "ui", Embeddable::Yes(embeddable.clone()), pool.clone()); + // old version + insert::(&mut pages, "v1", Embeddable::Yes(embeddable.clone()), pool.clone()); + pages.insert("proxy".into(), ProxyPac::boxed(embeddable.clone(), dapps_domain.to_owned())); pages.insert(WEB_PATH.into(), Web::boxed(embeddable.clone(), web_proxy_tokens.clone(), fetch.clone())); diff --git a/dapps/src/router.rs b/dapps/src/router.rs index 64617b3faade069fb8400d42351ecce4ef2eafce..e5770ca72b8f77578d21cdf646499da8930e3af2 100644 --- a/dapps/src/router.rs +++ b/dapps/src/router.rs @@ -138,6 +138,7 @@ impl Router { }, // Any other GET|HEAD requests to home page. _ if (is_get_request || is_head_request) && self.special.contains_key(&SpecialEndpoint::Home) => { + trace!(target: "dapps", "Resolving to home page."); let special = self.special.get(&SpecialEndpoint::Home).expect("special known to contain key; qed"); match *special { Some(ref special) => { diff --git a/dapps/src/tests/helpers/mod.rs b/dapps/src/tests/helpers/mod.rs index 4ee21c8f4eda5f25bb5be0a8495152d4d3f39a40..81ed5ed41b283e3834b1fe0814ab66e0ff9ae3a0 100644 --- a/dapps/src/tests/helpers/mod.rs +++ b/dapps/src/tests/helpers/mod.rs @@ -268,7 +268,7 @@ impl Server { }; let mut allowed_hosts: Option> = allowed_hosts.into(); - allowed_hosts.as_mut().map(|mut hosts| { + allowed_hosts.as_mut().map(|hosts| { hosts.push(format!("http://*.{}:*", DAPPS_DOMAIN).into()); hosts.push(format!("http://*.{}", DAPPS_DOMAIN).into()); }); diff --git a/dapps/ui/Cargo.toml b/dapps/ui/Cargo.toml index fe4629a368c0027730bae9f0b864d8d75e794b97..8d254b177c64e724c9ceeb9f404f356e3821068e 100644 --- a/dapps/ui/Cargo.toml +++ b/dapps/ui/Cargo.toml @@ -11,9 +11,11 @@ rustc_version = "0.1" [dependencies] parity-ui-dev = { path = "../../js", optional = true } +parity-ui-old-dev = { path = "../../js-old", optional = true } # This is managed by the js/scripts/release.sh script on CI - keep it in a single line +parity-ui-old-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "v1" } parity-ui-precompiled = { git = "https://github.com/paritytech/js-precompiled.git", optional = true, branch = "master" } [features] -no-precompiled-js = ["parity-ui-dev"] -use-precompiled-js = ["parity-ui-precompiled"] +no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"] +use-precompiled-js = ["parity-ui-precompiled", "parity-ui-old-precompiled"] diff --git a/dapps/ui/src/lib.rs b/dapps/ui/src/lib.rs index 931fd06beea804fade8392f6ad7a426b714e1fe8..aa1c86736668a09d325f1f91462c171a959ce265 100644 --- a/dapps/ui/src/lib.rs +++ b/dapps/ui/src/lib.rs @@ -29,5 +29,18 @@ mod inner { pub use self::parity_ui_precompiled::*; } +#[cfg(feature = "parity-ui-old-dev")] +pub mod old { + extern crate parity_ui_old_dev; + + pub use self::parity_ui_old_dev::*; +} + +#[cfg(feature = "parity-ui-old-precompiled")] +pub mod old { + extern crate parity_ui_old_precompiled; + + pub use self::parity_ui_old_precompiled::*; +} pub use self::inner::*; diff --git a/docs/CHANGELOG-1.7.md b/docs/CHANGELOG-1.7.md index c77157cd2e5d42576d57d67307d845d814cd2d55..4042d56da1022ca5de320b849d69447e98add140 100644 --- a/docs/CHANGELOG-1.7.md +++ b/docs/CHANGELOG-1.7.md @@ -1,3 +1,14 @@ +## Parity [v1.7.7](https://github.com/paritytech/parity/releases/tag/v1.7.7) (2017-10-15) + +Parity 1.7.7 Fixes an issue with auto-update system. Updating is recommended, but not required for Byzantium. + +Full list of included changes: + +- Fix auto-update ([#6769](https://github.com/paritytech/parity/pull/6759)) + - Bump to v1.7.7 + - Updated ethabi to fix auto-update +- Bumped fork block number for auto-update ([#6754](https://github.com/paritytech/parity/pull/6754)) + ## Parity [v1.7.6](https://github.com/paritytech/parity/releases/tag/v1.7.6) (2017-10-13) Parity 1.7.6 includes a critical consensus-relevant fix for the Byzantium hard-fork. Please upgrade your Ethereum client before block number `4_370_000`. diff --git a/ethcore/Cargo.toml b/ethcore/Cargo.toml index d9df99f9eed401627c8be31a307c839f67a6e56a..2f77b8cb3c57b154ed64f10282a2fdd745c75cb6 100644 --- a/ethcore/Cargo.toml +++ b/ethcore/Cargo.toml @@ -5,10 +5,6 @@ license = "GPL-3.0" name = "ethcore" version = "1.9.0" authors = ["Parity Technologies "] -build = "build.rs" - -[build-dependencies] -"ethcore-ipc-codegen" = { path = "../ipc/codegen" } [dependencies] ansi_term = "0.9" @@ -26,12 +22,11 @@ memorydb = { path = "../util/memorydb" } patricia_trie = { path = "../util/patricia_trie" } ethcore-devtools = { path = "../devtools" } ethcore-io = { path = "../util/io" } -ethcore-ipc = { path = "../ipc/rpc" } -ethcore-ipc-nano = { path = "../ipc/nano" } ethcore-logger = { path = "../logger" } ethcore-stratum = { path = "../stratum" } ethcore-util = { path = "../util" } ethcore-bigint = { path = "../util/bigint" } +memory-cache = { path = "../util/memory_cache" } ethjson = { path = "../json" } ethkey = { path = "../ethkey" } ethstore = { path = "../ethstore" } @@ -56,6 +51,8 @@ rand = "0.3" rlp = { path = "../util/rlp" } rlp_derive = { path = "../util/rlp_derive" } kvdb = { path = "../util/kvdb" } +kvdb-rocksdb = { path = "../util/kvdb-rocksdb" } +kvdb-memorydb = { path = "../util/kvdb-memorydb" } util-error = { path = "../util/error" } snappy = { path = "../util/snappy" } migration = { path = "../util/migration" } @@ -74,6 +71,7 @@ hash = { path = "../util/hash" } triehash = { path = "../util/triehash" } semantic_version = { path = "../util/semantic_version" } unexpected = { path = "../util/unexpected" } +journaldb = { path = "../util/journaldb" } [dev-dependencies] native-contracts = { path = "native_contracts", features = ["test_contracts"] } @@ -88,4 +86,3 @@ test-heavy = [] dev = ["clippy"] default = [] benches = [] -ipc = [] diff --git a/ethcore/evm/Cargo.toml b/ethcore/evm/Cargo.toml index 17b8664284e57ea8234e94bd8851b18d1c13ea1b..5cef517f44765df7d6f29ce2d58d5c605d9aeb0e 100644 --- a/ethcore/evm/Cargo.toml +++ b/ethcore/evm/Cargo.toml @@ -14,6 +14,7 @@ log = "0.3" vm = { path = "../vm" } hash = { path = "../../util/hash" } parking_lot = "0.4" +memory-cache = { path = "../../util/memory_cache" } [dev-dependencies] rustc-hex = "1.0" diff --git a/ethcore/evm/src/interpreter/shared_cache.rs b/ethcore/evm/src/interpreter/shared_cache.rs index 7b3b33b70614ad66be65566b979f7f56d4089947..d0386b1947581896294f6563c49d8ea74809a769 100644 --- a/ethcore/evm/src/interpreter/shared_cache.rs +++ b/ethcore/evm/src/interpreter/shared_cache.rs @@ -19,7 +19,7 @@ use hash::KECCAK_EMPTY; use heapsize::HeapSizeOf; use bigint::hash::H256; use parking_lot::Mutex; -use util::cache::MemoryLruCache; +use memory_cache::MemoryLruCache; use bit_set::BitSet; use super::super::instructions; diff --git a/ethcore/evm/src/lib.rs b/ethcore/evm/src/lib.rs index efc88d60d704b96fcbd3165439387b37ab002ecd..7ddbed19e623b1b7b9c0f9c236494ddee3fd3867 100644 --- a/ethcore/evm/src/lib.rs +++ b/ethcore/evm/src/lib.rs @@ -23,6 +23,7 @@ extern crate parking_lot; extern crate heapsize; extern crate vm; extern crate hash; +extern crate memory_cache; #[macro_use] extern crate lazy_static; diff --git a/ethcore/light/Cargo.toml b/ethcore/light/Cargo.toml index fb7030bcc1373ecab18bf214ff1aeee7144057a3..2b56a30bd4af0661e421b9d41ce86ed5546e79fd 100644 --- a/ethcore/light/Cargo.toml +++ b/ethcore/light/Cargo.toml @@ -5,10 +5,6 @@ license = "GPL-3.0" name = "ethcore-light" version = "1.9.0" authors = ["Parity Technologies "] -build = "build.rs" - -[build-dependencies] -"ethcore-ipc-codegen" = { path = "../../ipc/codegen", optional = true } [dependencies] log = "0.3" @@ -20,7 +16,6 @@ memorydb = { path = "../../util/memorydb" } patricia_trie = { path = "../../util/patricia_trie" } ethcore-network = { path = "../../util/network" } ethcore-io = { path = "../../util/io" } -ethcore-ipc = { path = "../../ipc/rpc", optional = true } ethcore-devtools = { path = "../../devtools" } evm = { path = "../evm" } heapsize = "0.4" @@ -40,7 +35,9 @@ stats = { path = "../../util/stats" } hash = { path = "../../util/hash" } triehash = { path = "../../util/triehash" } kvdb = { path = "../../util/kvdb" } +kvdb-rocksdb = { path = "../../util/kvdb-rocksdb" } +kvdb-memorydb = { path = "../../util/kvdb-memorydb" } +memory-cache = { path = "../../util/memory_cache" } [features] default = [] -ipc = ["ethcore-ipc", "ethcore-ipc-codegen"] diff --git a/ethcore/light/src/cache.rs b/ethcore/light/src/cache.rs index 65c3a4d0fa55cfa3cf47d26cd1a74b9d7cb66d61..8ec6b53af3b3b002faf03d0bd5c6430aa9cb1d78 100644 --- a/ethcore/light/src/cache.rs +++ b/ethcore/light/src/cache.rs @@ -29,7 +29,7 @@ use time::{SteadyTime, Duration}; use heapsize::HeapSizeOf; use bigint::prelude::U256; use bigint::hash::H256; -use util::cache::MemoryLruCache; +use memory_cache::MemoryLruCache; /// Configuration for how much data to cache. #[derive(Debug, Clone, PartialEq, Eq)] diff --git a/ethcore/light/src/client/header_chain.rs b/ethcore/light/src/client/header_chain.rs index c31fd4787ccbfea27825361062aef9d6261e425e..c406da4c935608acdfb06022180be7d5daf78efb 100644 --- a/ethcore/light/src/client/header_chain.rs +++ b/ethcore/light/src/client/header_chain.rs @@ -45,7 +45,7 @@ use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp, UntrustedRlp}; use heapsize::HeapSizeOf; use bigint::prelude::U256; use bigint::hash::{H256, H256FastMap, H264}; -use kvdb::{DBTransaction, KeyValueDB}; +use kvdb::{self, DBTransaction, KeyValueDB}; use cache::Cache; use parking_lot::{Mutex, RwLock}; @@ -198,7 +198,7 @@ impl HeaderChain { col: Option, spec: &Spec, cache: Arc>, - ) -> Result { + ) -> Result { let mut live_epoch_proofs = ::std::collections::HashMap::default(); let genesis = ::rlp::encode(&spec.genesis_header()).into_vec(); @@ -240,7 +240,7 @@ impl HeaderChain { let best_block = { let era = match candidates.get(&best_number) { Some(era) => era, - None => return Err(format!("Database corrupt: highest block referenced but no data.")), + None => return Err("Database corrupt: highest block referenced but no data.".into()), }; let best = &era.candidates[0]; @@ -728,13 +728,14 @@ mod tests { use ethcore::header::Header; use ethcore::spec::Spec; use cache::Cache; - use kvdb::{in_memory, KeyValueDB}; + use kvdb::KeyValueDB; + use kvdb_memorydb; use time::Duration; use parking_lot::Mutex; fn make_db() -> Arc { - Arc::new(in_memory(0)) + Arc::new(kvdb_memorydb::create(0)) } #[test] diff --git a/ethcore/light/src/client/mod.rs b/ethcore/light/src/client/mod.rs index fb0ec3917f158d1610e5fa588293e8abbc9c0212..a60ad4347070eca1324029ed008917bc7ea0424c 100644 --- a/ethcore/light/src/client/mod.rs +++ b/ethcore/light/src/client/mod.rs @@ -36,7 +36,8 @@ use bigint::prelude::U256; use bigint::hash::H256; use futures::{IntoFuture, Future}; -use kvdb::{KeyValueDB, CompactionProfile}; +use kvdb::{self, KeyValueDB}; +use kvdb_rocksdb::CompactionProfile; use self::fetch::ChainDataFetcher; use self::header_chain::{AncestryIter, HeaderChain}; @@ -186,7 +187,7 @@ impl Client { fetcher: T, io_channel: IoChannel, cache: Arc> - ) -> Result { + ) -> Result { Ok(Client { queue: HeaderQueue::new(config.queue, spec.engine.clone(), io_channel, config.check_seal), engine: spec.engine.clone(), @@ -214,7 +215,7 @@ impl Client { io_channel: IoChannel, cache: Arc> ) -> Self { - let db = ::kvdb::in_memory(0); + let db = ::kvdb_memorydb::create(0); Client::new( config, diff --git a/ethcore/light/src/client/service.rs b/ethcore/light/src/client/service.rs index f20d0ad90431a71c167f9fa41d1da2df17238b77..b05c7dacbd4722dd2d4560b618ca71fdc346455d 100644 --- a/ethcore/light/src/client/service.rs +++ b/ethcore/light/src/client/service.rs @@ -25,7 +25,8 @@ use ethcore::db; use ethcore::service::ClientIoMessage; use ethcore::spec::Spec; use io::{IoContext, IoError, IoHandler, IoService}; -use kvdb::{Database, DatabaseConfig}; +use kvdb; +use kvdb_rocksdb::{Database, DatabaseConfig}; use cache::Cache; use parking_lot::Mutex; @@ -36,7 +37,7 @@ use super::{ChainDataFetcher, Client, Config as ClientConfig}; #[derive(Debug)] pub enum Error { /// Database error. - Database(String), + Database(kvdb::Error), /// I/O service error. Io(IoError), } diff --git a/ethcore/light/src/lib.rs b/ethcore/light/src/lib.rs index edf655e4d74b5cc921e2a4e6598dba1eb315df3b..f9c3d89b824454c54e5a8e1b82e1343fea998f30 100644 --- a/ethcore/light/src/lib.rs +++ b/ethcore/light/src/lib.rs @@ -38,21 +38,8 @@ pub mod net; pub mod on_demand; pub mod transaction_queue; pub mod cache; - -#[cfg(not(feature = "ipc"))] pub mod provider; -#[cfg(feature = "ipc")] -pub mod provider { - #![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues - include!(concat!(env!("OUT_DIR"), "/provider.rs")); -} - -#[cfg(feature = "ipc")] -pub mod remote { - pub use provider::LightProviderClient; -} - mod types; pub use self::cache::Cache; @@ -92,9 +79,9 @@ extern crate vm; extern crate hash; extern crate triehash; extern crate kvdb; - -#[cfg(feature = "ipc")] -extern crate ethcore_ipc as ipc; +extern crate kvdb_memorydb; +extern crate kvdb_rocksdb; +extern crate memory_cache; #[cfg(test)] extern crate ethcore_devtools as devtools; diff --git a/ethcore/light/src/provider.rs b/ethcore/light/src/provider.rs index 3e2ddcb9d16d2b17ffd7c78d0e0c182758b62110..2e05157ad224b8730c8d7972671534c912397b19 100644 --- a/ethcore/light/src/provider.rs +++ b/ethcore/light/src/provider.rs @@ -34,7 +34,6 @@ use transaction_queue::TransactionQueue; use request; /// Defines the operations that a provider for the light subprotocol must fulfill. -#[cfg_attr(feature = "ipc", ipc(client_ident="LightProviderClient"))] pub trait Provider: Send + Sync { /// Provide current blockchain info. fn chain_info(&self) -> BlockChainInfo; @@ -328,7 +327,7 @@ impl Provider for LightProvider { } fn transaction_index(&self, _req: request::CompleteTransactionIndexRequest) - -> Option + -> Option { None } diff --git a/ethcore/light/src/types/mod.rs b/ethcore/light/src/types/mod.rs index 63fe7426787f11ca544fdbd7ad8f8027bd97d6e0..eba551b533c396d027c868f893165caba2d8315e 100644 --- a/ethcore/light/src/types/mod.rs +++ b/ethcore/light/src/types/mod.rs @@ -14,11 +14,4 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -//! Types used in the public (IPC) api which require custom code generation. -#![cfg_attr(feature = "ipc", allow(dead_code, unused_assignments, unused_variables))] // codegen issues - -#[cfg(feature = "ipc")] -include!(concat!(env!("OUT_DIR"), "/mod.rs.in")); - -#[cfg(not(feature = "ipc"))] -include!("mod.rs.in"); +pub mod request; diff --git a/ethcore/light/src/types/request/mod.rs b/ethcore/light/src/types/request/mod.rs index 050c79be8d004140df1ed9cb549549f224b2b9a6..2754e37eb8e751bb57d19ff23faa187efd8c7ad3 100644 --- a/ethcore/light/src/types/request/mod.rs +++ b/ethcore/light/src/types/request/mod.rs @@ -204,7 +204,6 @@ pub enum OutputKind { /// Either a hash or a number. #[derive(Debug, Clone, PartialEq, Eq)] -#[cfg_attr(feature = "ipc", binary)] pub enum HashOrNumber { /// Block hash variant. Hash(H256), diff --git a/ethcore/native_contracts/Cargo.toml b/ethcore/native_contracts/Cargo.toml index 2f91a4848674ad1e1a4c18b84aaea80bf589d999..2cc88fcdc00dc12248f8e4a241bc0fdcba95cb7d 100644 --- a/ethcore/native_contracts/Cargo.toml +++ b/ethcore/native_contracts/Cargo.toml @@ -6,7 +6,7 @@ authors = ["Parity Technologies "] build = "build.rs" [dependencies] -ethabi = "2.0" +ethabi = "4.0" futures = "0.1" byteorder = "1.0" ethcore-bigint = { path = "../../util/bigint" } diff --git a/ethcore/native_contracts/generator/Cargo.toml b/ethcore/native_contracts/generator/Cargo.toml index a599e756eba039cc3f36d650ccdccb7bdd614c84..243a5f597ea8d4bfe70fec281b698b71ae54e6d0 100644 --- a/ethcore/native_contracts/generator/Cargo.toml +++ b/ethcore/native_contracts/generator/Cargo.toml @@ -5,5 +5,5 @@ version = "0.1.0" authors = ["Parity Technologies "] [dependencies] -ethabi = "2.0" +ethabi = "4.0" heck = "0.2" diff --git a/ethcore/native_contracts/generator/src/lib.rs b/ethcore/native_contracts/generator/src/lib.rs index 4589473138b2d902dae506ce484705654ff58f72..a8848503e5df1712afdc2bd1ef5ec6ceeac2c7c8 100644 --- a/ethcore/native_contracts/generator/src/lib.rs +++ b/ethcore/native_contracts/generator/src/lib.rs @@ -21,18 +21,17 @@ //! due to missing crates or name collisions. This will change when //! it can be ported to a procedural macro. -use ethabi::Contract; -use ethabi::spec::{Interface, ParamType, Error as AbiError}; -use heck::SnakeCase; - extern crate ethabi; extern crate heck; +use ethabi::{Contract, ParamType}; +use heck::SnakeCase; + /// Errors in generation. #[derive(Debug)] pub enum Error { /// Bad ABI. - Abi(AbiError), + Abi(ethabi::Error), /// Unsupported parameter type in given function. UnsupportedType(String, ParamType), } @@ -41,13 +40,13 @@ pub enum Error { /// a struct which can be used to call it. // TODO: make this a proc macro when that's possible. pub fn generate_module(struct_name: &str, abi: &str) -> Result { - let contract = Contract::new(Interface::load(abi.as_bytes()).map_err(Error::Abi)?); + let contract = Contract::load(abi.as_bytes()).map_err(Error::Abi)?; let functions = generate_functions(&contract)?; Ok(format!(r##" use byteorder::{{BigEndian, ByteOrder}}; use futures::{{future, Future, IntoFuture}}; -use ethabi::{{Contract, Interface, Token, Event}}; +use ethabi::{{Contract, Token, Event}}; use bigint; type BoxFuture = Box + Send>; @@ -66,8 +65,8 @@ impl {name} {{ /// Create a new instance of `{name}` with an address. /// Calls can be made, given a callback for dispatching calls asynchronously. pub fn new(address: bigint::prelude::H160) -> Self {{ - let contract = Contract::new(Interface::load(ABI.as_bytes()) - .expect("ABI checked at generation-time; qed")); + let contract = Contract::load(ABI.as_bytes()) + .expect("ABI checked at generation-time; qed"); {name} {{ contract: contract, address: address, @@ -92,16 +91,16 @@ impl {name} {{ fn generate_functions(contract: &Contract) -> Result { let mut functions = String::new(); for function in contract.functions() { - let name = function.name(); + let name = &function.name; let snake_name = name.to_snake_case(); - let inputs = function.input_params(); - let outputs = function.output_params(); + let inputs: Vec<_> = function.inputs.iter().map(|i| i.kind.clone()).collect(); + let outputs: Vec<_> = function.outputs.iter().map(|i| i.kind.clone()).collect(); let (input_params, to_tokens) = input_params_codegen(&inputs) - .map_err(|bad_type| Error::UnsupportedType(name.into(), bad_type))?; + .map_err(|bad_type| Error::UnsupportedType(name.clone(), bad_type))?; let (output_type, decode_outputs) = output_params_codegen(&outputs) - .map_err(|bad_type| Error::UnsupportedType(name.into(), bad_type))?; + .map_err(|bad_type| Error::UnsupportedType(name.clone(), bad_type))?; functions.push_str(&format!(r##" /// Call the function "{abi_name}" on the contract. @@ -115,17 +114,17 @@ pub fn {snake_name}(&self, call: F, {params}) -> BoxFuture<{output_type}, U::Future: Send + 'static {{ let function = self.contract.function(r#"{abi_name}"#) - .expect("function existence checked at compile-time; qed"); + .expect("function existence checked at compile-time; qed").clone(); let call_addr = self.address; - let call_future = match function.encode_call({to_tokens}) {{ + let call_future = match function.encode_input(&{to_tokens}) {{ Ok(call_data) => (call)(call_addr, call_data), Err(e) => return Box::new(future::err(format!("Error encoding call: {{:?}}", e))), }}; Box::new(call_future .into_future() - .and_then(move |out| function.decode_output(out).map_err(|e| format!("{{:?}}", e))) + .and_then(move |out| function.decode_output(&out).map_err(|e| format!("{{:?}}", e))) .map(Vec::into_iter) .and_then(|mut outputs| {decode_outputs})) }} @@ -325,7 +324,7 @@ fn detokenize(name: &str, output_type: ParamType) -> String { #[cfg(test)] mod tests { - use ethabi::spec::ParamType; + use ethabi::ParamType; #[test] fn input_types() { diff --git a/ethcore/node_filter/Cargo.toml b/ethcore/node_filter/Cargo.toml index 9ebbf1e184e1ed9b163436ddc6209588ff53d4f2..7879074ff5770728b41f8464643a8d29537ef165 100644 --- a/ethcore/node_filter/Cargo.toml +++ b/ethcore/node_filter/Cargo.toml @@ -11,10 +11,12 @@ ethcore = { path = ".."} ethcore-util = { path = "../../util" } ethcore-bigint = { path = "../../util/bigint" } ethcore-bytes = { path = "../../util/bytes" } -ethcore-io = { path = "../../util/io" } ethcore-network = { path = "../../util/network" } -kvdb = { path = "../../util/kvdb" } native-contracts = { path = "../native_contracts" } futures = "0.1" log = "0.3" parking_lot = "0.4" + +[dev-dependencies] +kvdb-memorydb = { path = "../../util/kvdb-memorydb" } +ethcore-io = { path = "../../util/io" } diff --git a/ethcore/node_filter/src/lib.rs b/ethcore/node_filter/src/lib.rs index e92dba61de9ec63b51b5848d215aadbc2b2830dc..d2c64cb39fc49e3c1e4a36e490654944b1fd10de 100644 --- a/ethcore/node_filter/src/lib.rs +++ b/ethcore/node_filter/src/lib.rs @@ -24,9 +24,14 @@ extern crate ethcore_network as network; extern crate native_contracts; extern crate futures; extern crate parking_lot; -extern crate kvdb; -#[cfg(test)] extern crate ethcore_io as io; -#[macro_use] extern crate log; + +#[macro_use] +extern crate log; + +#[cfg(test)] +extern crate kvdb_memorydb; +#[cfg(test)] +extern crate ethcore_io as io; use std::sync::Weak; use std::collections::HashMap; @@ -135,7 +140,7 @@ mod test { let contract_addr = Address::from_str("0000000000000000000000000000000000000005").unwrap(); let data = include_bytes!("../res/node_filter.json"); let spec = Spec::load(&::std::env::temp_dir(), &data[..]).unwrap(); - let client_db = Arc::new(::kvdb::in_memory(::ethcore::db::NUM_COLUMNS.unwrap_or(0))); + let client_db = Arc::new(::kvdb_memorydb::create(::ethcore::db::NUM_COLUMNS.unwrap_or(0))); let client = Client::new( ClientConfig::default(), diff --git a/ethcore/res/ethereum/morden.json b/ethcore/res/ethereum/morden.json index ab32cb3d54d1b650ab9b4583878cbff5205c3303..f84818d63f4deeefc2617cef012b0fa4364ce86d 100644 --- a/ethcore/res/ethereum/morden.json +++ b/ethcore/res/ethereum/morden.json @@ -13,6 +13,7 @@ "eip160Transition": 1915000, "ecip1010PauseTransition": 1915000, "ecip1010ContinueTransition": 3415000, + "ecip1017EraRounds": 2000000, "eip161abcTransition": "0x7fffffffffffffff", "eip161dTransition": "0x7fffffffffffffff" @@ -49,11 +50,13 @@ "gasLimit": "0x2fefd8" }, "nodes": [ - "enode://e731347db0521f3476e6bbbb83375dcd7133a1601425ebd15fd10f3835fd4c304fba6282087ca5a0deeafadf0aa0d4fd56c3323331901c1f38bd181c283e3e35@128.199.55.137:30303", - "enode://ceb5c0f85eb994dbe9693bf46d99b03f6b838d17cc74e68d5eb003171ff39e5f120b17f965b267c319303f94d80b9d994b77062fb1486d76ce95d9f3d8fe1cb4@46.101.122.141:30303", "enode://fb28713820e718066a2f5df6250ae9d07cff22f672dbf26be6c75d088f821a9ad230138ba492c533a80407d054b1436ef18e951bb65e6901553516c8dffe8ff0@104.155.176.151:30304", "enode://afdc6076b9bf3e7d3d01442d6841071e84c76c73a7016cb4f35c0437df219db38565766234448f1592a07ba5295a867f0ce87b359bf50311ed0b830a2361392d@104.154.136.117:30403", - "enode://21101a9597b79e933e17bc94ef3506fe99a137808907aa8fefa67eea4b789792ad11fb391f38b00087f8800a2d3dff011572b62a31232133dd1591ac2d1502c8@104.198.71.200:30403" + "enode://21101a9597b79e933e17bc94ef3506fe99a137808907aa8fefa67eea4b789792ad11fb391f38b00087f8800a2d3dff011572b62a31232133dd1591ac2d1502c8@104.198.71.200:30403", + "enode://fd008499e9c4662f384b3cff23438879d31ced24e2d19504c6389bc6da6c882f9c2f8dbed972f7058d7650337f54e4ba17bb49c7d11882dd1731d26a6e62e3cb@35.187.57.94:30304", + "enode://30a1fd71f28aa6f66fe662af9ecc75f0a6980f06b71598f2b19d3dda04223fc0e53b47e40c9171d5014e9f5b59d9954de125782da592f5d95ea39066e2591d5d@104.237.131.102:30304", + "enode://7909d51011d8a153351169f21d3a7bbedb3be1e17d38c1f2fad06504dd5aa07a00f00845835d535fe702bf379c4d7209a51f4d1b723e0ca8b8732bd21fba3b30@139.162.133.42:30303", + "enode://a088dfb2f5305be9232e8071c5535f13718a4017e247a0b35074b807d43d99e022880c27302cdb5b1e98ad34c083dbbb483f2b17bdc66149bad037154d6ace96@139.162.127.72:30303" ], "accounts": { "0000000000000000000000000000000000000001": { "balance": "1", "nonce": "1048576", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } }, diff --git a/ethcore/src/account_provider/stores.rs b/ethcore/src/account_provider/stores.rs index 72bc04da65c6516878ef9691602212404e285920..45652a8a651406d8d86d7dfd5616cff329f34941 100644 --- a/ethcore/src/account_provider/stores.rs +++ b/ethcore/src/account_provider/stores.rs @@ -64,7 +64,7 @@ impl AddressBook { /// Sets new name for given address. pub fn set_name(&mut self, a: Address, name: String) { { - let mut x = self.cache.entry(a) + let x = self.cache.entry(a) .or_insert_with(|| AccountMeta {name: Default::default(), meta: "{}".to_owned(), uuid: None}); x.name = name; } @@ -74,7 +74,7 @@ impl AddressBook { /// Sets new meta for given address. pub fn set_meta(&mut self, a: Address, meta: String) { { - let mut x = self.cache.entry(a) + let x = self.cache.entry(a) .or_insert_with(|| AccountMeta {name: "Anonymous".to_owned(), meta: Default::default(), uuid: None}); x.meta = meta; } @@ -253,7 +253,7 @@ impl DappsSettingsStore { /// Marks recent dapp as used pub fn mark_dapp_used(&mut self, dapp: DappId) { { - let mut entry = self.history.entry(dapp).or_insert_with(|| Default::default()); + let entry = self.history.entry(dapp).or_insert_with(|| Default::default()); entry.last_accessed = self.time.get(); } // Clear extraneous entries @@ -280,7 +280,7 @@ impl DappsSettingsStore { /// Sets accounts for specific dapp. pub fn set_accounts(&mut self, id: DappId, accounts: Option>) { { - let mut settings = self.settings.entry(id).or_insert_with(DappsSettings::default); + let settings = self.settings.entry(id).or_insert_with(DappsSettings::default); settings.accounts = accounts; } self.settings.save(JsonSettings::write); @@ -289,7 +289,7 @@ impl DappsSettingsStore { /// Sets a default account for specific dapp. pub fn set_default(&mut self, id: DappId, default: Address) { { - let mut settings = self.settings.entry(id).or_insert_with(DappsSettings::default); + let settings = self.settings.entry(id).or_insert_with(DappsSettings::default); settings.default = Some(default); } self.settings.save(JsonSettings::write); diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs index a55cf669f4bf5830ed42d21eb2f22c3bed691118..8e71d5f426cd11ff530c04f9ecdcc04cb72c4ace 100644 --- a/ethcore/src/blockchain/blockchain.rs +++ b/ethcore/src/blockchain/blockchain.rs @@ -1479,7 +1479,8 @@ mod tests { use std::sync::Arc; use rustc_hex::FromHex; use hash::keccak; - use kvdb::{in_memory, KeyValueDB}; + use kvdb::KeyValueDB; + use kvdb_memorydb; use bigint::hash::*; use receipt::{Receipt, TransactionOutcome}; use blockchain::{BlockProvider, BlockChain, Config, ImportRoute}; @@ -1493,7 +1494,7 @@ mod tests { use header::BlockNumber; fn new_db() -> Arc { - Arc::new(in_memory(::db::NUM_COLUMNS.unwrap_or(0))) + Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))) } fn new_chain(genesis: &[u8], db: Arc) -> BlockChain { diff --git a/ethcore/src/client/chain_notify.rs b/ethcore/src/client/chain_notify.rs index 00b744167cd423c7931c84e284a3b30cef1194ca..5dd2861ae21a6c7c067db5b59252e2e1a3e062e1 100644 --- a/ethcore/src/client/chain_notify.rs +++ b/ethcore/src/client/chain_notify.rs @@ -14,12 +14,10 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use ipc::IpcConfig; use bigint::hash::H256; use bytes::Bytes; /// Represents what has to be handled by actor listening to chain events -#[ipc] pub trait ChainNotify : Send + Sync { /// fires when chain has new blocks. fn new_blocks( @@ -57,5 +55,3 @@ pub trait ChainNotify : Send + Sync { // does nothing by default } } - -impl IpcConfig for ChainNotify { } diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index 1b954b347601bd2006e6f6c5b42313df135549e1..b65e698dfc4603b2f166d96c2014456ed0211812 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -26,10 +26,11 @@ use itertools::Itertools; use hash::keccak; use timer::PerfTimer; use bytes::Bytes; -use util::{Address, journaldb, DBValue}; +use util::{Address, DBValue}; +use journaldb; use util_error::UtilError; use trie::{TrieSpec, TrieFactory, Trie}; -use kvdb::*; +use kvdb::{KeyValueDB, DBTransaction}; // other use bigint::prelude::U256; diff --git a/ethcore/src/client/config.rs b/ethcore/src/client/config.rs index e629732d5546f332c4316233f49393239b081897..ce5878f1e97c0287435ad67d971adde334cfba6c 100644 --- a/ethcore/src/client/config.rs +++ b/ethcore/src/client/config.rs @@ -20,8 +20,8 @@ use std::fmt::{Display, Formatter, Error as FmtError}; use mode::Mode as IpcMode; use verification::{VerifierType, QueueConfig}; -use util::journaldb; -use kvdb::CompactionProfile; +use journaldb; +use kvdb_rocksdb::CompactionProfile; pub use std::time::Duration; pub use blockchain::Config as BlockChainConfig; diff --git a/ethcore/src/client/error.rs b/ethcore/src/client/error.rs index aaa9fa83fa62ce34c312d4b2c08ce396669a3fcb..d2af13a3b27f8da862c0431c7add05e4083f51f3 100644 --- a/ethcore/src/client/error.rs +++ b/ethcore/src/client/error.rs @@ -14,9 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -use util_error::UtilError; use std::fmt::{Display, Formatter, Error as FmtError}; - +use util_error::UtilError; +use kvdb; use trie::TrieError; /// Client configuration errors. @@ -25,7 +25,7 @@ pub enum Error { /// TrieDB-related error. Trie(TrieError), /// Database error - Database(String), + Database(kvdb::Error), /// Util error Util(UtilError), } diff --git a/ethcore/src/client/evm_test_client.rs b/ethcore/src/client/evm_test_client.rs index 7734d5ad2ced7f37ebbd187815c4d8af856823d7..366735d5613a13a99068b9ccce30097a9bce6b8a 100644 --- a/ethcore/src/client/evm_test_client.rs +++ b/ethcore/src/client/evm_test_client.rs @@ -20,9 +20,8 @@ use std::fmt; use std::sync::Arc; use bigint::prelude::U256; use bigint::hash::H256; -use util::journaldb; -use trie; -use bytes; +use journaldb; +use {trie, kvdb_memorydb, bytes}; use kvdb::{self, KeyValueDB}; use {state, state_db, client, executive, trace, transaction, db, spec, pod_state}; use factory::Factories; @@ -39,7 +38,7 @@ pub enum EvmTestError { /// Initialization error. ClientError(::error::Error), /// Low-level database error. - Database(String), + Database(kvdb::Error), /// Post-condition failure, PostCondition(String), } @@ -128,7 +127,7 @@ impl<'a> EvmTestClient<'a> { } fn state_from_spec(spec: &'a spec::Spec, factories: &Factories) -> Result, EvmTestError> { - let db = Arc::new(kvdb::in_memory(db::NUM_COLUMNS.expect("We use column-based DB; qed"))); + let db = Arc::new(kvdb_memorydb::create(db::NUM_COLUMNS.expect("We use column-based DB; qed"))); let journal_db = journaldb::new(db.clone(), journaldb::Algorithm::EarlyMerge, db::COL_STATE); let mut state_db = state_db::StateDB::new(journal_db, 5 * 1024 * 1024); state_db = spec.ensure_db_good(state_db, factories)?; @@ -150,7 +149,7 @@ impl<'a> EvmTestClient<'a> { } fn state_from_pod(spec: &'a spec::Spec, factories: &Factories, pod_state: pod_state::PodState) -> Result, EvmTestError> { - let db = Arc::new(kvdb::in_memory(db::NUM_COLUMNS.expect("We use column-based DB; qed"))); + let db = Arc::new(kvdb_memorydb::create(db::NUM_COLUMNS.expect("We use column-based DB; qed"))); let journal_db = journaldb::new(db.clone(), journaldb::Algorithm::EarlyMerge, db::COL_STATE); let state_db = state_db::StateDB::new(journal_db, 5 * 1024 * 1024); let mut state = state::State::new( diff --git a/ethcore/src/client/mod.rs b/ethcore/src/client/mod.rs index 9377c2f4430410725c16a3016721aa35bd8c6235..2960f303d3ad5ac51283e0f608e4243fbefa20d1 100644 --- a/ethcore/src/client/mod.rs +++ b/ethcore/src/client/mod.rs @@ -45,21 +45,6 @@ pub use vm::{LastHashes, EnvInfo}; pub use error::{BlockImportError, TransactionImportError, TransactionImportResult}; pub use verification::VerifierType; -/// IPC interfaces -#[cfg(feature="ipc")] -pub mod remote { - pub use super::traits::RemoteClient; - pub use super::chain_notify::ChainNotifyClient; -} - -mod traits { - #![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues - include!(concat!(env!("OUT_DIR"), "/traits.rs")); -} - -pub mod chain_notify { - //! Chain notify interface - #![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues - include!(concat!(env!("OUT_DIR"), "/chain_notify.rs")); -} +mod traits; +mod chain_notify; diff --git a/ethcore/src/client/test_client.rs b/ethcore/src/client/test_client.rs index 82f9693200b81ec56445ea1f05ccd06d8996da79..d06f94768f642b4682e9574c3c8b813c76f5af08 100644 --- a/ethcore/src/client/test_client.rs +++ b/ethcore/src/client/test_client.rs @@ -26,8 +26,9 @@ use hash::keccak; use bigint::prelude::U256; use bigint::hash::H256; use parking_lot::RwLock; -use util::*; -use kvdb::{Database, DatabaseConfig}; +use journaldb; +use util::{Address, DBValue}; +use kvdb_rocksdb::{Database, DatabaseConfig}; use bytes::Bytes; use rlp::*; use ethkey::{Generator, Random}; diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs index b4fc60f14092f9346753e56b2d6ebbf80e4c63b3..3ff60baf9df10d6ff0e3049439b6a072ff782f3c 100644 --- a/ethcore/src/client/traits.rs +++ b/ethcore/src/client/traits.rs @@ -27,7 +27,6 @@ use evm::{Factory as EvmFactory, Schedule}; use executive::Executed; use filter::Filter; use header::{BlockNumber}; -use ipc::IpcConfig; use log_entry::LocalizedLogEntry; use receipt::LocalizedReceipt; use trace::LocalizedTrace; @@ -49,7 +48,6 @@ use types::block_status::BlockStatus; use types::mode::Mode; use types::pruning_info::PruningInfo; -#[ipc(client_ident="RemoteClient")] /// Blockchain database client. Owns and manages a blockchain and a block queue. pub trait BlockChainClient : Sync + Send { @@ -287,8 +285,6 @@ pub trait BlockChainClient : Sync + Send { fn eip86_transition(&self) -> u64; } -impl IpcConfig for BlockChainClient { } - /// Extended client interface used for mining pub trait MiningBlockChainClient: BlockChainClient { /// Returns OpenBlock prepared for closing. diff --git a/ethcore/src/encoded.rs b/ethcore/src/encoded.rs index 1f7ee98b5ed844c9a746316f476aff62b8b9a3eb..27aca1426c4ec7aa968d192b88ee536bd806f7b0 100644 --- a/ethcore/src/encoded.rs +++ b/ethcore/src/encoded.rs @@ -37,7 +37,6 @@ use rlp::Rlp; /// Owning header view. #[derive(Debug, Clone, PartialEq, Eq)] -#[cfg_attr(feature = "ipc", binary)] pub struct Header(Vec); impl HeapSizeOf for Header { @@ -115,7 +114,6 @@ impl Header { /// Owning block body view. #[derive(Debug, Clone, PartialEq, Eq)] -#[cfg_attr(feature = "ipc", binary)] pub struct Body(Vec); impl HeapSizeOf for Body { @@ -175,7 +173,6 @@ impl Body { /// Owning block view. #[derive(Debug, Clone, PartialEq, Eq)] -#[cfg_attr(feature = "ipc", binary)] pub struct Block(Vec); impl HeapSizeOf for Block { diff --git a/ethcore/src/engines/mod.rs b/ethcore/src/engines/mod.rs index 2e583b179c78cfc702d04de894158f8106d5f35e..802b4ab88c4fdce8126af397bba71ad5cbf72850 100644 --- a/ethcore/src/engines/mod.rs +++ b/ethcore/src/engines/mod.rs @@ -421,7 +421,7 @@ pub mod common { .and_then(|_| fields.state.commit()); let block_author = fields.header.author().clone(); - fields.traces.as_mut().map(move |mut traces| { + fields.traces.as_mut().map(move |traces| { let mut tracer = ExecutiveTracer::default(); tracer.trace_reward(block_author, reward, RewardType::Block); traces.push(tracer.drain()) diff --git a/ethcore/src/engines/tendermint/mod.rs b/ethcore/src/engines/tendermint/mod.rs index 3ccc79baaee808fe28a9fe97cefa228a60a79ab6..97cc18c03d45424a4893025614d2328794f1a5ff 100644 --- a/ethcore/src/engines/tendermint/mod.rs +++ b/ethcore/src/engines/tendermint/mod.rs @@ -782,7 +782,7 @@ mod tests { use block::*; use error::{Error, BlockError}; use header::Header; - use client::chain_notify::ChainNotify; + use client::ChainNotify; use miner::MinerService; use tests::helpers::*; use account_provider::AccountProvider; diff --git a/ethcore/src/engines/validator_set/safe_contract.rs b/ethcore/src/engines/validator_set/safe_contract.rs index 7489a26e047a71ecec1d77fdc15448b47d942991..695f2a6582af88f66f5fa183ab478409f26139c5 100644 --- a/ethcore/src/engines/validator_set/safe_contract.rs +++ b/ethcore/src/engines/validator_set/safe_contract.rs @@ -27,7 +27,7 @@ use parking_lot::{Mutex, RwLock}; use util::*; use bytes::Bytes; -use util::cache::MemoryLruCache; +use memory_cache::MemoryLruCache; use unexpected::Mismatch; use rlp::{UntrustedRlp, RlpStream}; @@ -276,7 +276,7 @@ impl ValidatorSafeContract { .filter(move |l| check_log(l)) .filter_map(|log| { let topics = log.topics.iter().map(|x| x.0.clone()).collect(); - event.decode_log(topics, log.data.clone()).ok() + event.parse_log((topics, log.data.clone()).into()).ok() }); match decoded_events.next() { @@ -285,7 +285,7 @@ impl ValidatorSafeContract { // decode log manually until the native contract generator is // good enough to do it for us. - let validators_token = &matched_event[1].value; + let validators_token = &matched_event.params[1].value; let validators = validators_token.clone().to_array() .and_then(|a| a.into_iter() diff --git a/ethcore/src/error.rs b/ethcore/src/error.rs index 0146c684aa19ba8670ddf00588ff3245c368e01b..49b873a47bfa56c435aec7e9d86406ed3a5e0fa8 100644 --- a/ethcore/src/error.rs +++ b/ethcore/src/error.rs @@ -29,7 +29,6 @@ use io::*; use header::BlockNumber; use basic_types::LogBloom; use client::Error as ClientError; -use ipc::binary::{BinaryConvertError, BinaryConvertable}; use snapshot::Error as SnapshotError; use engines::EngineError; use ethkey::Error as EthkeyError; @@ -486,21 +485,3 @@ impl From> for Error where Error: From { Error::from(*err) } } - -binary_fixed_size!(BlockError); -binary_fixed_size!(ImportError); -binary_fixed_size!(TransactionError); - -// TODO: uncomment below once https://github.com/rust-lang/rust/issues/27336 sorted. -/*#![feature(concat_idents)] -macro_rules! assimilate { - ($name:ident) => ( - impl From for Error { - fn from(err: concat_idents!($name, Error)) -> Error { - Error:: $name (err) - } - } - ) -} -assimilate!(FromHex); -assimilate!(BaseData);*/ diff --git a/ethcore/src/ethereum/mod.rs b/ethcore/src/ethereum/mod.rs index 75c321ebe7f349aeeee938f56e4fc70dded94720..09b272cb38d0f59934616316ae079378d1634b50 100644 --- a/ethcore/src/ethereum/mod.rs +++ b/ethcore/src/ethereum/mod.rs @@ -31,7 +31,7 @@ use machine::EthereumMachine; use super::spec::*; /// Most recent fork block that we support on Mainnet. -pub const FORK_SUPPORTED_FOUNDATION: u64 = 2675000; +pub const FORK_SUPPORTED_FOUNDATION: u64 = 4370000; /// Most recent fork block that we support on Ropsten. pub const FORK_SUPPORTED_ROPSTEN: u64 = 10; diff --git a/ethcore/src/executive.rs b/ethcore/src/executive.rs index 2a70689db1b082accb252fe71eebb7ec815ab675..3709ea44960a0ae7f7e9044887567a35770f1ddd 100644 --- a/ethcore/src/executive.rs +++ b/ethcore/src/executive.rs @@ -433,7 +433,7 @@ impl<'a, B: 'a + StateBackend> Executive<'a, B> { // trace only top level calls to builtins to avoid DDoS attacks if self.depth == 0 { let mut trace_output = tracer.prepare_trace_output(); - if let Some(mut out) = trace_output.as_mut() { + if let Some(out) = trace_output.as_mut() { *out = output.to_owned(); } diff --git a/ethcore/src/json_tests/chain.rs b/ethcore/src/json_tests/chain.rs index 9bd0d4c94ed7db78d76e066b117da468c6d0a906..e82bc77403658587356070259bb492c6052517f3 100644 --- a/ethcore/src/json_tests/chain.rs +++ b/ethcore/src/json_tests/chain.rs @@ -57,7 +57,7 @@ pub fn json_chain_test(json_data: &[u8]) -> Vec { }; { - let db = Arc::new(::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0))); + let db = Arc::new(::kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))); let mut config = ClientConfig::default(); config.history = 8; let client = Client::new( diff --git a/ethcore/src/lib.rs b/ethcore/src/lib.rs index a67eb879a425e6480dfbeabf7f2080f197e9c4bf..4620cc8928ee0e76a8bca1bba2d21998938318b3 100644 --- a/ethcore/src/lib.rs +++ b/ethcore/src/lib.rs @@ -81,7 +81,6 @@ extern crate ethash; extern crate ethcore_bloom_journal as bloom_journal; extern crate ethcore_devtools as devtools; extern crate ethcore_io as io; -extern crate ethcore_ipc_nano as nanoipc; extern crate ethcore_bigint as bigint; extern crate ethcore_bytes as bytes; extern crate ethcore_logger; @@ -113,6 +112,8 @@ extern crate ansi_term; extern crate semantic_version; extern crate unexpected; extern crate kvdb; +extern crate kvdb_rocksdb; +extern crate kvdb_memorydb; extern crate util_error; extern crate snappy; extern crate migration; @@ -129,6 +130,8 @@ extern crate bloomable; extern crate vm; extern crate wasm; extern crate ethcore_util as util; +extern crate memory_cache; +extern crate journaldb; #[macro_use] extern crate macros; @@ -136,8 +139,6 @@ extern crate macros; extern crate log; #[macro_use] extern crate lazy_static; -#[macro_use] -extern crate ethcore_ipc as ipc; #[cfg_attr(test, macro_use)] extern crate evm; diff --git a/ethcore/src/machine.rs b/ethcore/src/machine.rs index 2536384e63b21922dc9b2a4cf07c0229b343a304..667211c52825957740e263454ec6defe34da9d4f 100644 --- a/ethcore/src/machine.rs +++ b/ethcore/src/machine.rs @@ -263,7 +263,7 @@ impl EthereumMachine { } else if block_number < ext.eip150_transition { Schedule::new_homestead() } else { - /// There's no max_code_size transition so we tie it to eip161abc + // There's no max_code_size transition so we tie it to eip161abc let max_code_size = if block_number >= ext.eip161abc_transition { self.params.max_code_size as usize } else { diff --git a/ethcore/src/migrations/state/v7.rs b/ethcore/src/migrations/state/v7.rs index cbf517d1dcb34c64ed27c0cdd1456e31b0a07689..b7c9211ff30b78540f23ff1916b7bd24108c2827 100644 --- a/ethcore/src/migrations/state/v7.rs +++ b/ethcore/src/migrations/state/v7.rs @@ -22,8 +22,8 @@ use std::collections::HashMap; use bigint::hash::H256; use util::Address; use bytes::Bytes; -use kvdb::Database; -use migration::{Batch, Config, Error, Migration, SimpleMigration, Progress}; +use kvdb_rocksdb::Database; +use migration::{Batch, Config, Error, ErrorKind, Migration, SimpleMigration, Progress}; use hash::keccak; use std::sync::Arc; @@ -109,7 +109,7 @@ impl OverlayRecentV7 { // walk all journal entries in the database backwards. // find migrations for any possible inserted keys. fn walk_journal(&mut self, source: Arc) -> Result<(), Error> { - if let Some(val) = source.get(None, V7_LATEST_ERA_KEY).map_err(Error::Custom)? { + if let Some(val) = source.get(None, V7_LATEST_ERA_KEY)? { let mut era = decode::(&val); loop { let mut index: usize = 0; @@ -120,7 +120,7 @@ impl OverlayRecentV7 { r.out() }; - if let Some(journal_raw) = source.get(None, &entry_key).map_err(Error::Custom)? { + if let Some(journal_raw) = source.get(None, &entry_key)? { let rlp = Rlp::new(&journal_raw); // migrate all inserted keys. @@ -153,7 +153,7 @@ impl OverlayRecentV7 { // replace all possible inserted/deleted keys with their migrated counterparts // and commit the altered entries. fn migrate_journal(&self, source: Arc, mut batch: Batch, dest: &mut Database) -> Result<(), Error> { - if let Some(val) = source.get(None, V7_LATEST_ERA_KEY).map_err(Error::Custom)? { + if let Some(val) = source.get(None, V7_LATEST_ERA_KEY)? { batch.insert(V7_LATEST_ERA_KEY.into(), val.clone().into_vec(), dest)?; let mut era = decode::(&val); @@ -166,7 +166,7 @@ impl OverlayRecentV7 { r.out() }; - if let Some(journal_raw) = source.get(None, &entry_key).map_err(Error::Custom)? { + if let Some(journal_raw) = source.get(None, &entry_key)? { let rlp = Rlp::new(&journal_raw); let id: H256 = rlp.val_at(0); let mut inserted_keys: Vec<(H256, Bytes)> = Vec::new(); @@ -233,9 +233,9 @@ impl Migration for OverlayRecentV7 { let mut batch = Batch::new(config, col); // check version metadata. - match source.get(None, V7_VERSION_KEY).map_err(Error::Custom)? { + match source.get(None, V7_VERSION_KEY)? { Some(ref version) if decode::(&*version) == DB_VERSION => {} - _ => return Err(Error::MigrationImpossible), // missing or wrong version + _ => return Err(ErrorKind::MigrationImpossible.into()), // missing or wrong version } let mut count = 0; diff --git a/ethcore/src/migrations/v10.rs b/ethcore/src/migrations/v10.rs index 155d6f4c06144e3f788c3ffeb40b72a158288044..e9317d4a6d9c1b1bc6c2627cbcc45a6ad0f018cb 100644 --- a/ethcore/src/migrations/v10.rs +++ b/ethcore/src/migrations/v10.rs @@ -22,11 +22,12 @@ use state_db::{ACCOUNT_BLOOM_SPACE, DEFAULT_ACCOUNT_PRESET, StateDB}; use trie::TrieDB; use views::HeaderView; use bloom_journal::Bloom; -use migration::{Error, Migration, Progress, Batch, Config}; -use util::journaldb; +use migration::{Error, Migration, Progress, Batch, Config, ErrorKind}; +use journaldb; use bigint::hash::H256; use trie::Trie; -use kvdb::{Database, DBTransaction}; +use kvdb::{DBTransaction, ResultExt}; +use kvdb_rocksdb::Database; /// Account bloom upgrade routine. If bloom already present, does nothing. /// If database empty (no best block), does nothing. @@ -59,9 +60,9 @@ pub fn generate_bloom(source: Arc, dest: &mut Database) -> Result<(), source.clone(), journaldb::Algorithm::OverlayRecent, COL_STATE); - let account_trie = TrieDB::new(state_db.as_hashdb(), &state_root).map_err(|e| Error::Custom(format!("Cannot open trie: {:?}", e)))?; - for item in account_trie.iter().map_err(|_| Error::MigrationImpossible)? { - let (ref account_key, _) = item.map_err(|_| Error::MigrationImpossible)?; + let account_trie = TrieDB::new(state_db.as_hashdb(), &state_root).chain_err(|| "Cannot open trie")?; + for item in account_trie.iter().map_err(|_| ErrorKind::MigrationImpossible)? { + let (ref account_key, _) = item.map_err(|_| ErrorKind::MigrationImpossible)?; let account_key_hash = H256::from_slice(account_key); bloom.set(&*account_key_hash); } @@ -72,7 +73,7 @@ pub fn generate_bloom(source: Arc, dest: &mut Database) -> Result<(), trace!(target: "migration", "Generated {} bloom updates", bloom_journal.entries.len()); let mut batch = DBTransaction::new(); - StateDB::commit_bloom(&mut batch, bloom_journal).map_err(|_| Error::Custom("Failed to commit bloom".to_owned()))?; + StateDB::commit_bloom(&mut batch, bloom_journal).chain_err(|| "Failed to commit bloom")?; dest.write(batch)?; trace!(target: "migration", "Finished bloom update"); diff --git a/ethcore/src/migrations/v9.rs b/ethcore/src/migrations/v9.rs index 7c28054fad59d03cc86c3f76ab630865c80cd8f0..39637dc4eea93caee4f3632409e3a574e232ed6a 100644 --- a/ethcore/src/migrations/v9.rs +++ b/ethcore/src/migrations/v9.rs @@ -18,7 +18,7 @@ //! This migration consolidates all databases into single one using Column Families. use rlp::{Rlp, RlpStream}; -use kvdb::Database; +use kvdb_rocksdb::Database; use migration::{Batch, Config, Error, Migration, Progress}; use std::sync::Arc; diff --git a/ethcore/src/miner/banning_queue.rs b/ethcore/src/miner/banning_queue.rs index a446da29ea14a520f019f7032ec76190c1add7e4..d89c30b86a9c7ee32f797fc61963c88785162d12 100644 --- a/ethcore/src/miner/banning_queue.rs +++ b/ethcore/src/miner/banning_queue.rs @@ -149,7 +149,7 @@ impl BanningTransactionQueue { /// queue. fn ban_sender(&mut self, address: Address) -> bool { let count = { - let mut count = self.senders_bans.entry(address).or_insert_with(|| 0); + let count = self.senders_bans.entry(address).or_insert_with(|| 0); *count = count.saturating_add(1); *count }; @@ -169,7 +169,7 @@ impl BanningTransactionQueue { /// Returns true if bans threshold has been reached. fn ban_recipient(&mut self, address: Address) -> bool { let count = { - let mut count = self.recipients_bans.entry(address).or_insert_with(|| 0); + let count = self.recipients_bans.entry(address).or_insert_with(|| 0); *count = count.saturating_add(1); *count }; @@ -185,7 +185,7 @@ impl BanningTransactionQueue { /// If bans threshold is reached all subsequent transactions to contracts with this codehash will be rejected. /// Returns true if bans threshold has been reached. fn ban_codehash(&mut self, code_hash: H256) -> bool { - let mut count = self.codes_bans.entry(code_hash).or_insert_with(|| 0); + let count = self.codes_bans.entry(code_hash).or_insert_with(|| 0); *count = count.saturating_add(1); match self.ban_threshold { diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs index 0234af06849a885e1e4912fe8d5262120cbf34ac..2accbecc01c49875631a430821ca0dfa77d94a5f 100644 --- a/ethcore/src/miner/transaction_queue.rs +++ b/ethcore/src/miner/transaction_queue.rs @@ -341,7 +341,7 @@ impl GasPriceQueue { /// Remove an item from a BTreeMap/HashSet "multimap". /// Returns true if the item was removed successfully. pub fn remove(&mut self, gas_price: &U256, hash: &H256) -> bool { - if let Some(mut hashes) = self.backing.get_mut(gas_price) { + if let Some(hashes) = self.backing.get_mut(gas_price) { let only_one_left = hashes.len() == 1; if !only_one_left { // Operation may be ok: only if hash is in gas-price's Set. @@ -1225,7 +1225,7 @@ impl TransactionQueue { if by_nonce.is_none() { return; } - let mut by_nonce = by_nonce.expect("None is tested in early-exit condition above; qed"); + let by_nonce = by_nonce.expect("None is tested in early-exit condition above; qed"); while let Some(order) = by_nonce.remove(¤t_nonce) { // remove also from priority and gas_price self.future.by_priority.remove(&order); diff --git a/ethcore/src/service.rs b/ethcore/src/service.rs index 64773a236459db54b367fc95af506408826b99d7..078f02d465054ec9ee6e38ea04d64bffaabff4dc 100644 --- a/ethcore/src/service.rs +++ b/ethcore/src/service.rs @@ -19,7 +19,8 @@ use std::sync::Arc; use std::path::Path; use bigint::hash::H256; -use kvdb::{Database, DatabaseConfig, KeyValueDB}; +use kvdb::KeyValueDB; +use kvdb_rocksdb::{Database, DatabaseConfig}; use bytes::Bytes; use io::*; use spec::Spec; @@ -29,12 +30,8 @@ use miner::Miner; use snapshot::{ManifestData, RestorationStatus}; use snapshot::service::{Service as SnapshotService, ServiceParams as SnapServiceParams}; -use std::sync::atomic::AtomicBool; use ansi_term::Colour; -#[cfg(feature="ipc")] -use nanoipc; - /// Message type for external and internal events #[derive(Clone, PartialEq, Eq, Debug)] pub enum ClientIoMessage { @@ -72,7 +69,7 @@ impl ClientService { spec: &Spec, client_path: &Path, snapshot_path: &Path, - ipc_path: &Path, + _ipc_path: &Path, miner: Arc, ) -> Result { @@ -120,7 +117,6 @@ impl ClientService { spec.engine.register_client(Arc::downgrade(&client) as _); let stop_guard = ::devtools::StopGuard::new(); - run_ipc(ipc_path, client.clone(), snapshot.clone(), stop_guard.share()); Ok(ClientService { io_service: Arc::new(io_service), @@ -228,38 +224,6 @@ impl IoHandler for ClientIoHandler { } } -#[cfg(feature="ipc")] -fn run_ipc(base_path: &Path, client: Arc, snapshot_service: Arc, stop: Arc) { - let mut path = base_path.to_owned(); - path.push("parity-chain.ipc"); - let socket_addr = format!("ipc://{}", path.to_string_lossy()); - let s = stop.clone(); - ::std::thread::spawn(move || { - let mut worker = nanoipc::Worker::new(&(client as Arc)); - worker.add_reqrep(&socket_addr).expect("Ipc expected to initialize with no issues"); - - while !s.load(::std::sync::atomic::Ordering::Relaxed) { - worker.poll(); - } - }); - - let mut path = base_path.to_owned(); - path.push("parity-snapshot.ipc"); - let socket_addr = format!("ipc://{}", path.to_string_lossy()); - ::std::thread::spawn(move || { - let mut worker = nanoipc::Worker::new(&(snapshot_service as Arc<::snapshot::SnapshotService>)); - worker.add_reqrep(&socket_addr).expect("Ipc expected to initialize with no issues"); - - while !stop.load(::std::sync::atomic::Ordering::Relaxed) { - worker.poll(); - } - }); -} - -#[cfg(not(feature="ipc"))] -fn run_ipc(_base_path: &Path, _client: Arc, _snapshot_service: Arc, _stop: Arc) { -} - #[cfg(test)] mod tests { use super::*; diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs index e33c47e2c6f91c303bc55505ed0f27c8cd774600..02adb2c1682d1f268e05fd924e278aa444d6d810 100644 --- a/ethcore/src/snapshot/mod.rs +++ b/ethcore/src/snapshot/mod.rs @@ -36,7 +36,7 @@ use util::{HashDB, DBValue}; use snappy; use bytes::Bytes; use parking_lot::Mutex; -use util::journaldb::{self, Algorithm, JournalDB}; +use journaldb::{self, Algorithm, JournalDB}; use kvdb::KeyValueDB; use trie::{TrieDB, TrieDBMut, Trie, TrieMut}; use rlp::{RlpStream, UntrustedRlp}; @@ -72,16 +72,7 @@ mod watcher; #[cfg(test)] mod tests; -/// IPC interfaces -#[cfg(feature="ipc")] -pub mod remote { - pub use super::traits::RemoteSnapshotService; -} - -mod traits { - #![allow(dead_code, unused_assignments, unused_variables, missing_docs)] // codegen issues - include!(concat!(env!("OUT_DIR"), "/snapshot_service_trait.rs")); -} +mod traits; // Try to have chunks be around 4MB (before compression) const PREFERRED_CHUNK_SIZE: usize = 4 * 1024 * 1024; diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs index a53824b1f9bec183d967515488f09bf4a0e813ea..21e7a6752eaba094f9ab80f7ead82a862f3099f8 100644 --- a/ethcore/src/snapshot/service.rs +++ b/ethcore/src/snapshot/service.rs @@ -39,8 +39,8 @@ use bigint::hash::H256; use parking_lot::{Mutex, RwLock, RwLockReadGuard}; use util_error::UtilError; use bytes::Bytes; -use util::journaldb::Algorithm; -use kvdb::{Database, DatabaseConfig}; +use journaldb::Algorithm; +use kvdb_rocksdb::{Database, DatabaseConfig}; use snappy; /// Helper for removing directories in case of error. @@ -625,7 +625,7 @@ mod tests { use io::{IoService}; use devtools::RandomTempPath; use tests::helpers::get_test_spec; - use util::journaldb::Algorithm; + use journaldb::Algorithm; use error::Error; use snapshot::{ManifestData, RestorationStatus, SnapshotService}; use super::*; @@ -682,7 +682,7 @@ mod tests { #[test] fn cannot_finish_with_invalid_chunks() { use bigint::hash::H256; - use kvdb::DatabaseConfig; + use kvdb_rocksdb::DatabaseConfig; let spec = get_test_spec(); let dir = RandomTempPath::new(); diff --git a/ethcore/src/snapshot/tests/helpers.rs b/ethcore/src/snapshot/tests/helpers.rs index cdd51a63cb8682d61a315df106a23e3b0b5dea37..a6f0cbb0549aaeadcca97b0d7815daccdcd1ac9d 100644 --- a/ethcore/src/snapshot/tests/helpers.rs +++ b/ethcore/src/snapshot/tests/helpers.rs @@ -35,7 +35,7 @@ use util::DBValue; use kvdb::KeyValueDB; use bigint::hash::H256; use hashdb::HashDB; -use util::journaldb; +use journaldb; use trie::{Alphabet, StandardMap, SecTrieDBMut, TrieMut, ValueMode}; use trie::{TrieDB, TrieDBMut, Trie}; diff --git a/ethcore/src/snapshot/tests/proof_of_authority.rs b/ethcore/src/snapshot/tests/proof_of_authority.rs index 9634fd53102212fa1e10de0f14c182db540d3081..f15954ce8de470737e383904b3fe7e0fb08950f9 100644 --- a/ethcore/src/snapshot/tests/proof_of_authority.rs +++ b/ethcore/src/snapshot/tests/proof_of_authority.rs @@ -31,7 +31,7 @@ use tests::helpers; use transaction::{Transaction, Action, SignedTransaction}; use util::Address; -use kvdb; +use kvdb_memorydb; const PASS: &'static str = ""; const TRANSITION_BLOCK_1: usize = 2; // block at which the contract becomes activated. @@ -238,7 +238,7 @@ fn fixed_to_contract_only() { assert_eq!(client.chain_info().best_block_number, 11); let reader = snapshot_helpers::snap(&*client); - let new_db = kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)); + let new_db = kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)); let spec = spec_fixed_to_contract(); // ensure fresh engine's step matches. @@ -270,7 +270,7 @@ fn fixed_to_contract_to_contract() { assert_eq!(client.chain_info().best_block_number, 16); let reader = snapshot_helpers::snap(&*client); - let new_db = kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0)); + let new_db = kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0)); let spec = spec_fixed_to_contract(); for _ in 0..16 { spec.engine.step() } diff --git a/ethcore/src/snapshot/tests/proof_of_work.rs b/ethcore/src/snapshot/tests/proof_of_work.rs index 8002e4362279b30609f3bc0cc594885d3e00aa35..d4df7bb101bc85058933961313b25cc290e5e1ba 100644 --- a/ethcore/src/snapshot/tests/proof_of_work.rs +++ b/ethcore/src/snapshot/tests/proof_of_work.rs @@ -26,7 +26,8 @@ use snapshot::io::{PackedReader, PackedWriter, SnapshotReader, SnapshotWriter}; use parking_lot::Mutex; use snappy; -use kvdb::{self, KeyValueDB, DBTransaction}; +use kvdb::{KeyValueDB, DBTransaction}; +use kvdb_memorydb; use std::sync::Arc; use std::sync::atomic::AtomicBool; @@ -43,7 +44,7 @@ fn chunk_and_restore(amount: u64) { let mut snapshot_path = new_path.as_path().to_owned(); snapshot_path.push("SNAP"); - let old_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0))); + let old_db = Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))); let bc = BlockChain::new(Default::default(), &genesis, old_db.clone()); // build the blockchain. @@ -80,7 +81,7 @@ fn chunk_and_restore(amount: u64) { writer.into_inner().finish(manifest.clone()).unwrap(); // restore it. - let new_db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0))); + let new_db = Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))); let new_chain = BlockChain::new(Default::default(), &genesis, new_db.clone()); let mut rebuilder = SNAPSHOT_MODE.rebuilder(new_chain, new_db.clone(), &manifest).unwrap(); @@ -127,7 +128,7 @@ fn checks_flag() { let chunk = stream.out(); - let db = Arc::new(kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0))); + let db = Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))); let engine = ::spec::Spec::new_test().engine; let chain = BlockChain::new(Default::default(), &genesis, db.clone()); diff --git a/ethcore/src/snapshot/tests/service.rs b/ethcore/src/snapshot/tests/service.rs index d391883a9059ff57e653e4a05053130929ff9b52..7730d67a94fd74c03feb2d2ff575663c5e957c3e 100644 --- a/ethcore/src/snapshot/tests/service.rs +++ b/ethcore/src/snapshot/tests/service.rs @@ -27,7 +27,7 @@ use tests::helpers::generate_dummy_client_with_spec_and_data; use devtools::RandomTempPath; use io::IoChannel; -use kvdb::{Database, DatabaseConfig}; +use kvdb_rocksdb::{Database, DatabaseConfig}; struct NoopDBRestore; @@ -69,7 +69,7 @@ fn restored_is_equivalent() { engine: spec.engine.clone(), genesis_block: spec.genesis_block(), db_config: db_config, - pruning: ::util::journaldb::Algorithm::Archive, + pruning: ::journaldb::Algorithm::Archive, channel: IoChannel::disconnected(), snapshot_root: path, db_restore: client2.clone(), @@ -112,7 +112,7 @@ fn guards_delete_folders() { engine: spec.engine.clone(), genesis_block: spec.genesis_block(), db_config: DatabaseConfig::with_columns(::db::NUM_COLUMNS), - pruning: ::util::journaldb::Algorithm::Archive, + pruning: ::journaldb::Algorithm::Archive, channel: IoChannel::disconnected(), snapshot_root: path.clone(), db_restore: Arc::new(NoopDBRestore), diff --git a/ethcore/src/snapshot/tests/state.rs b/ethcore/src/snapshot/tests/state.rs index 175ae4eb86dd2e0b23ca275e2e3d2e6af2e65e90..213053a68722ab2b74071d53b3f0a6273ae34f31 100644 --- a/ethcore/src/snapshot/tests/state.rs +++ b/ethcore/src/snapshot/tests/state.rs @@ -26,8 +26,8 @@ use error::Error; use rand::{XorShiftRng, SeedableRng}; use bigint::hash::H256; -use util::journaldb::{self, Algorithm}; -use kvdb::{Database, DatabaseConfig}; +use journaldb::{self, Algorithm}; +use kvdb_rocksdb::{Database, DatabaseConfig}; use memorydb::MemoryDB; use parking_lot::Mutex; use devtools::RandomTempPath; diff --git a/ethcore/src/snapshot/snapshot_service_trait.rs b/ethcore/src/snapshot/traits.rs similarity index 95% rename from ethcore/src/snapshot/snapshot_service_trait.rs rename to ethcore/src/snapshot/traits.rs index 8208400df70689ddcb9b67570262e9fac2df9ae0..632a36afa1ce3ca4b9a15bc57b01014bbb911b8c 100644 --- a/ethcore/src/snapshot/snapshot_service_trait.rs +++ b/ethcore/src/snapshot/traits.rs @@ -17,13 +17,11 @@ use super::{ManifestData, RestorationStatus}; use bigint::hash::H256; use bytes::Bytes; -use ipc::IpcConfig; /// The interface for a snapshot network service. /// This handles: /// - restoration of snapshots to temporary databases. /// - responding to queries for snapshot manifests and chunks -#[ipc(client_ident="RemoteSnapshotService")] pub trait SnapshotService : Sync + Send { /// Query the most recent manifest data. fn manifest(&self) -> Option; @@ -54,5 +52,3 @@ pub trait SnapshotService : Sync + Send { /// no-op if currently restoring. fn restore_block_chunk(&self, hash: H256, chunk: Bytes); } - -impl IpcConfig for SnapshotService { } diff --git a/ethcore/src/spec/spec.rs b/ethcore/src/spec/spec.rs index a1696c47b29c7a813bae712e850df93976dd920f..14a7ff41390e494ba27887dcd294e6d78d52b8d4 100644 --- a/ethcore/src/spec/spec.rs +++ b/ethcore/src/spec/spec.rs @@ -670,14 +670,14 @@ impl Spec { /// constructor. pub fn genesis_epoch_data(&self) -> Result, String> { use transaction::{Action, Transaction}; - use util::journaldb; - use kvdb; + use journaldb; + use kvdb_memorydb; let genesis = self.genesis_header(); let factories = Default::default(); let mut db = journaldb::new( - Arc::new(kvdb::in_memory(0)), + Arc::new(kvdb_memorydb::create(0)), journaldb::Algorithm::Archive, None, ); diff --git a/ethcore/src/state/mod.rs b/ethcore/src/state/mod.rs index 96fd46ec5b62133a9dfcd6a6df4c175acc8ff4f7..dfde0592175f40ff70335351ead32e4121fed10c 100644 --- a/ethcore/src/state/mod.rs +++ b/ethcore/src/state/mod.rs @@ -962,7 +962,7 @@ impl State { // at this point the entry is guaranteed to be in the cache. Ok(RefMut::map(self.cache.borrow_mut(), |c| { - let mut entry = c.get_mut(a).expect("entry known to exist in the cache; qed"); + let entry = c.get_mut(a).expect("entry known to exist in the cache; qed"); match &mut entry.account { &mut Some(ref mut acc) => not_default(acc), diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs index 6d2885a5aa7e19fc352410927884d6cd506994b2..953b7b388fdd6029cc85f9f5d60a46524090ec5e 100644 --- a/ethcore/src/state_db.rs +++ b/ethcore/src/state_db.rs @@ -17,8 +17,8 @@ use std::collections::{VecDeque, HashSet}; use std::sync::Arc; use lru_cache::LruCache; -use util::cache::MemoryLruCache; -use util::journaldb::JournalDB; +use memory_cache::MemoryLruCache; +use journaldb::JournalDB; use kvdb::{KeyValueDB, DBTransaction}; use bigint::hash::H256; use hashdb::HashDB; @@ -211,7 +211,7 @@ impl StateDB { pub fn sync_cache(&mut self, enacted: &[H256], retracted: &[H256], is_best: bool) { trace!("sync_cache id = (#{:?}, {:?}), parent={:?}, best={}", self.commit_number, self.commit_hash, self.parent_hash, is_best); let mut cache = self.account_cache.lock(); - let mut cache = &mut *cache; + let cache = &mut *cache; // Purge changes from re-enacted and retracted blocks. // Filter out commiting block if any. diff --git a/ethcore/src/tests/client.rs b/ethcore/src/tests/client.rs index 2f67ece8f321c89b9ae2a278649ddc980d4b63e0..b75f0863ad670f2565ba9afee1587aea30a3e225 100644 --- a/ethcore/src/tests/client.rs +++ b/ethcore/src/tests/client.rs @@ -27,7 +27,7 @@ use tests::helpers::*; use types::filter::Filter; use bigint::prelude::U256; use util::*; -use kvdb::{Database, DatabaseConfig}; +use kvdb_rocksdb::{Database, DatabaseConfig}; use devtools::*; use miner::Miner; use spec::Spec; diff --git a/ethcore/src/tests/helpers.rs b/ethcore/src/tests/helpers.rs index 52a0dedc6a86d895e95c12851f387e91d923f10d..1b286df9aec567a3ba13357f33f8720152419802 100644 --- a/ethcore/src/tests/helpers.rs +++ b/ethcore/src/tests/helpers.rs @@ -36,7 +36,6 @@ use state_db::StateDB; use state::*; use std::sync::Arc; use transaction::{Action, Transaction, SignedTransaction}; -use util::*; use views::BlockView; // TODO: move everything over to get_null_spec. @@ -232,7 +231,7 @@ pub fn get_test_client_with_blocks(blocks: Vec) -> Arc { } fn new_db() -> Arc<::kvdb::KeyValueDB> { - Arc::new(::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0))) + Arc::new(::kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))) } pub fn generate_dummy_blockchain(block_number: u32) -> BlockChain { @@ -282,7 +281,7 @@ pub fn get_temp_state_with_factory(factory: EvmFactory) -> State<::state_db::Sta pub fn get_temp_state_db() -> StateDB { let db = new_db(); - let journal_db = journaldb::new(db, journaldb::Algorithm::EarlyMerge, ::db::COL_STATE); + let journal_db = ::journaldb::new(db, ::journaldb::Algorithm::EarlyMerge, ::db::COL_STATE); StateDB::new(journal_db, 5 * 1024 * 1024) } diff --git a/ethcore/src/tests/mod.rs b/ethcore/src/tests/mod.rs index c86240f33fcc9abca337a9e55c9a268d0c8c1646..eec71efafbfc10355679f2c456223f96a8acb312 100644 --- a/ethcore/src/tests/mod.rs +++ b/ethcore/src/tests/mod.rs @@ -18,7 +18,3 @@ pub mod helpers; mod client; mod evm; mod trace; - -#[cfg(feature="ipc")] -mod rpc; - diff --git a/ethcore/src/tests/rpc.rs b/ethcore/src/tests/rpc.rs deleted file mode 100644 index 6444daa56b5d156b262a2021b4a58a73930f6c75..0000000000000000000000000000000000000000 --- a/ethcore/src/tests/rpc.rs +++ /dev/null @@ -1,78 +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 . - -//! Client RPC tests - -use nanoipc; -use std::sync::Arc; -use std::sync::atomic::{Ordering, AtomicBool}; -use client::{Client, BlockChainClient, ClientConfig, BlockId}; -use client::remote::RemoteClient; -use tests::helpers::*; -use devtools::*; -use miner::Miner; -use crossbeam; -use io::IoChannel; -use util::kvdb::DatabaseConfig; - -pub fn run_test_worker(scope: &crossbeam::Scope, stop: Arc, socket_path: &str) { - let socket_path = socket_path.to_owned(); - scope.spawn(move || { - let temp = RandomTempPath::create_dir(); - let spec = get_test_spec(); - let db_config = DatabaseConfig::with_columns(::db::NUM_COLUMNS); - - let client = Client::new( - ClientConfig::default(), - &spec, - temp.as_path(), - Arc::new(Miner::with_spec(&spec)), - IoChannel::disconnected(), - &db_config - ).unwrap(); - let mut worker = nanoipc::Worker::new(&(client as Arc)); - worker.add_reqrep(&socket_path).unwrap(); - while !stop.load(Ordering::Relaxed) { - worker.poll(); - } - }); -} - -#[test] -fn can_handshake() { - crossbeam::scope(|scope| { - let stop_guard = StopGuard::new(); - let socket_path = "ipc:///tmp/parity-client-rpc-10.ipc"; - run_test_worker(scope, stop_guard.share(), socket_path); - let remote_client = nanoipc::generic_client::>(socket_path).unwrap(); - - assert!(remote_client.handshake().is_ok()); - }) -} - -#[test] -fn can_query_block() { - crossbeam::scope(|scope| { - let stop_guard = StopGuard::new(); - let socket_path = "ipc:///tmp/parity-client-rpc-20.ipc"; - run_test_worker(scope, stop_guard.share(), socket_path); - let remote_client = nanoipc::generic_client::>(socket_path).unwrap(); - - let non_existant_block = remote_client.block_header(BlockId::Number(999)); - - assert!(non_existant_block.is_none()); - }) -} diff --git a/ethcore/src/tests/trace.rs b/ethcore/src/tests/trace.rs index 270d29597a20cacbadab72c7c6098b1c3ce91e91..57a745a1ae99585ce0529f31c8019056eb694ae8 100644 --- a/ethcore/src/tests/trace.rs +++ b/ethcore/src/tests/trace.rs @@ -27,7 +27,7 @@ use client::*; use tests::helpers::*; use devtools::RandomTempPath; use client::{BlockChainClient, Client, ClientConfig}; -use kvdb::{Database, DatabaseConfig}; +use kvdb_rocksdb::{Database, DatabaseConfig}; use std::sync::Arc; use header::Header; use miner::Miner; diff --git a/ethcore/src/trace/db.rs b/ethcore/src/trace/db.rs index 087acdcc98dd3b32e794f395cfce604d95185a59..9d7136cb19d4350754813edcf0818573577312d8 100644 --- a/ethcore/src/trace/db.rs +++ b/ethcore/src/trace/db.rs @@ -416,7 +416,8 @@ mod tests { use bigint::prelude::U256; use bigint::hash::H256; use util::Address; - use kvdb::{DBTransaction, in_memory, KeyValueDB}; + use kvdb::{DBTransaction, KeyValueDB}; + use kvdb_memorydb; use header::BlockNumber; use trace::{Config, TraceDB, Database as TraceDatabase, DatabaseExtras, ImportRequest}; use trace::{Filter, LocalizedTrace, AddressesFilter, TraceError}; @@ -467,7 +468,7 @@ mod tests { } fn new_db() -> Arc { - Arc::new(in_memory(::db::NUM_COLUMNS.unwrap_or(0))) + Arc::new(kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))) } #[test] diff --git a/ethcore/src/trace/types/trace.rs b/ethcore/src/trace/types/trace.rs index 8c48e6a4a7c1ef9571feeaf7dee3313d6941d9b2..efe9ecfa2929d205b742f1c1eb1f03c94ac3bbc3 100644 --- a/ethcore/src/trace/types/trace.rs +++ b/ethcore/src/trace/types/trace.rs @@ -30,7 +30,6 @@ use super::error::Error; /// `Call` result. #[derive(Debug, Clone, PartialEq, Default, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] pub struct CallResult { /// Gas used by call. pub gas_used: U256, @@ -40,7 +39,6 @@ pub struct CallResult { /// `Create` result. #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] pub struct CreateResult { /// Gas used by create. pub gas_used: U256, @@ -59,7 +57,6 @@ impl CreateResult { /// Description of a _call_ action, either a `CALL` operation or a message transction. #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] pub struct Call { /// The sending account. pub from: Address, @@ -99,7 +96,6 @@ impl Call { /// Description of a _create_ action, either a `CREATE` operation or a create transction. #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] pub struct Create { /// The address of the creator. pub from: Address, @@ -132,7 +128,6 @@ impl Create { /// Reward type. #[derive(Debug, PartialEq, Clone)] -#[cfg_attr(feature = "ipc", binary)] pub enum RewardType { /// Block Block, @@ -162,7 +157,6 @@ impl Decodable for RewardType { /// Reward action #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "ipc", binary)] pub struct Reward { /// Author's address. pub author: Address, @@ -203,7 +197,6 @@ impl Decodable for Reward { /// Suicide action. #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] pub struct Suicide { /// Suicided address. pub address: Address, @@ -223,7 +216,6 @@ impl Suicide { /// Description of an action that we trace; will be either a call or a create. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "ipc", binary)] pub enum Action { /// It's a call action. Call(Call), @@ -287,7 +279,6 @@ impl Action { /// The result of the performed action. #[derive(Debug, Clone, PartialEq)] -#[cfg_attr(feature = "ipc", binary)] pub enum Res { /// Successful call action result. Call(CallResult), @@ -365,7 +356,6 @@ impl Res { } #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] /// A diff of some chunk of memory. pub struct MemoryDiff { /// Offset into memory the change begins. @@ -375,7 +365,6 @@ pub struct MemoryDiff { } #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] /// A diff of some storage value. pub struct StorageDiff { /// Which key in storage is changed. @@ -385,7 +374,6 @@ pub struct StorageDiff { } #[derive(Debug, Clone, PartialEq, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] /// A record of an executed VM operation. pub struct VMExecutedOperation { /// The total gas used. @@ -399,7 +387,6 @@ pub struct VMExecutedOperation { } #[derive(Debug, Clone, PartialEq, Default, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] /// A record of the execution of a single VM operation. pub struct VMOperation { /// The program counter. @@ -413,7 +400,6 @@ pub struct VMOperation { } #[derive(Debug, Clone, PartialEq, Default, RlpEncodable, RlpDecodable)] -#[cfg_attr(feature = "ipc", binary)] /// A record of a full VM trace for a CALL/CREATE. pub struct VMTrace { /// The step (i.e. index into operations) at which this trace corresponds. diff --git a/ethcore/src/tx_filter.rs b/ethcore/src/tx_filter.rs index ac40b8ab6bfb922b93235f0976ae121b4abb3939..d0bff8dffad4239c3d6f9a5c986a7eda38445c0a 100644 --- a/ethcore/src/tx_filter.rs +++ b/ethcore/src/tx_filter.rs @@ -178,7 +178,7 @@ mod test { "#; let spec = Spec::load(&::std::env::temp_dir(), spec_data.as_bytes()).unwrap(); - let client_db = Arc::new(::kvdb::in_memory(::db::NUM_COLUMNS.unwrap_or(0))); + let client_db = Arc::new(::kvdb_memorydb::create(::db::NUM_COLUMNS.unwrap_or(0))); let client = Client::new( ClientConfig::default(), diff --git a/ethcore/src/verification/queue/mod.rs b/ethcore/src/verification/queue/mod.rs index 198c6328774aef6afc790071fda4a5d5ffa4ed9c..bf7c9ef5ca83195c9fe6687d165436c35a73b2ad 100644 --- a/ethcore/src/verification/queue/mod.rs +++ b/ethcore/src/verification/queue/mod.rs @@ -522,7 +522,7 @@ impl VerificationQueue { return; } let mut verified_lock = self.verification.verified.lock(); - let mut verified = &mut *verified_lock; + let verified = &mut *verified_lock; let mut bad = self.verification.bad.lock(); let mut processing = self.processing.write(); bad.reserve(hashes.len()); diff --git a/ethcore/types/src/account_diff.rs b/ethcore/types/src/account_diff.rs index c1eb89d925850bcb1767f4991ea7e83926740330..ae1cf3e98940df64a473e119a0d30ede41475fa3 100644 --- a/ethcore/types/src/account_diff.rs +++ b/ethcore/types/src/account_diff.rs @@ -51,7 +51,6 @@ impl Diff where T: Eq { } #[derive(Debug, PartialEq, Eq, Clone)] -#[cfg_attr(feature = "ipc", binary)] /// Account diff. pub struct AccountDiff { /// Change in balance, allowed to be `Diff::Same`. @@ -65,7 +64,6 @@ pub struct AccountDiff { } #[derive(Debug, PartialEq, Eq, Clone)] -#[cfg_attr(feature = "ipc", binary)] /// Change in existance type. // TODO: include other types of change. pub enum Existance { diff --git a/ethkey/src/extended.rs b/ethkey/src/extended.rs index 45ed0547f07c05eeaeac8a4c58a06f46ab66d6a5..c545cd3e4033e4dbf8839a270cef8c7079867a85 100644 --- a/ethkey/src/extended.rs +++ b/ethkey/src/extended.rs @@ -477,8 +477,8 @@ mod tests { .expect("Seed should be valid H128") .to_vec(); - /// private key from bitcoin test vector - /// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs + // private key from bitcoin test vector + // xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs let test_private = H256::from_str("e8f32e723decf4051aefac8e2c93c9c5b214313817cdb01a1494b917c8436b35") .expect("Private should be decoded ok"); @@ -489,8 +489,8 @@ mod tests { #[test] fn test_vector_1() { - /// xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7 - /// H(0) + // xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7 + // H(0) test_extended( |secret| secret.derive(2147483648.into()), H256::from_str("edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea") @@ -500,8 +500,8 @@ mod tests { #[test] fn test_vector_2() { - /// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs - /// H(0)/1 + // xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs + // H(0)/1 test_extended( |secret| secret.derive(2147483648.into()).derive(1.into()), H256::from_str("3c6cb8d0f6a264c91ea8b5030fadaa8e538b020f0a387421a12de9319dc93368") diff --git a/ethstore/src/dir/memory.rs b/ethstore/src/dir/memory.rs index b8c2ad9ff5b549f154b279b4dcdc1dd53b526a0e..bd162b5ef0ce7ca7b4360c323878b32b3cd8634d 100644 --- a/ethstore/src/dir/memory.rs +++ b/ethstore/src/dir/memory.rs @@ -35,7 +35,7 @@ impl KeyDirectory for MemoryDirectory { fn update(&self, account: SafeAccount) -> Result { let mut lock = self.accounts.write(); - let mut accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new); + let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new); // If the filename is the same we just need to replace the entry accounts.retain(|acc| acc.filename != account.filename); accounts.push(account.clone()); @@ -44,14 +44,14 @@ impl KeyDirectory for MemoryDirectory { fn insert(&self, account: SafeAccount) -> Result { let mut lock = self.accounts.write(); - let mut accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new); + let accounts = lock.entry(account.address.clone()).or_insert_with(Vec::new); accounts.push(account.clone()); Ok(account) } fn remove(&self, account: &SafeAccount) -> Result<(), Error> { let mut accounts = self.accounts.write(); - let is_empty = if let Some(mut accounts) = accounts.get_mut(&account.address) { + let is_empty = if let Some(accounts) = accounts.get_mut(&account.address) { if let Some(position) = accounts.iter().position(|acc| acc == account) { accounts.remove(position); } diff --git a/ethstore/src/ethstore.rs b/ethstore/src/ethstore.rs index f3bb2407134f4c2912fc99492bccd4c5254fd900..7588cc9fbbcf928f128dbd0123fb9f8b89731078 100755 --- a/ethstore/src/ethstore.rs +++ b/ethstore/src/ethstore.rs @@ -358,7 +358,7 @@ impl EthMultiStore { // update cache let mut cache = self.cache.write(); - let mut accounts = cache.entry(account_ref.clone()).or_insert_with(Vec::new); + let accounts = cache.entry(account_ref.clone()).or_insert_with(Vec::new); // Remove old account accounts.retain(|acc| acc != &old); // And push updated to the end diff --git a/hash-fetch/Cargo.toml b/hash-fetch/Cargo.toml index c52f1e23284d81ba3b458a3f593336971a7604fd..7b0e8b7cd77b71368217149d8eb3aa6c50a9ac6a 100644 --- a/hash-fetch/Cargo.toml +++ b/hash-fetch/Cargo.toml @@ -22,5 +22,5 @@ native-contracts = { path = "../ethcore/native_contracts" } hash = { path = "../util/hash" } [dev-dependencies] -ethabi = "2.0" +ethabi = "4.0" parking_lot = "0.4" diff --git a/hash-fetch/src/urlhint.rs b/hash-fetch/src/urlhint.rs index e19860e32e69ebb3a50b9d5405a824b562ccaec3..0670266df8892c7896be45114fe24f99450df818 100644 --- a/hash-fetch/src/urlhint.rs +++ b/hash-fetch/src/urlhint.rs @@ -265,8 +265,8 @@ pub mod tests { // given let registrar = FakeRegistrar::new(); let resolve_result = { - use ethabi::{Encoder, Token}; - Encoder::encode(vec![Token::String(String::new()), Token::FixedBytes(vec![0; 20]), Token::Address([0; 20])]) + use ethabi::{encode, Token}; + encode(&[Token::String(String::new()), Token::FixedBytes(vec![0; 20]), Token::Address([0; 20])]) }; registrar.responses.lock()[1] = Ok(resolve_result); diff --git a/hw/src/ledger.rs b/hw/src/ledger.rs index 5fcac3e556a59fc75989cf084e1790d45bfb2e1c..6b4c87a0a6e8c46454b548e8233d477e3a723aa0 100644 --- a/hw/src/ledger.rs +++ b/hw/src/ledger.rs @@ -255,7 +255,7 @@ impl Manager { let mut chunk_size = if chunk_index == 0 { 12 } else { 5 }; let size = min(64 - chunk_size, data.len() - offset); { - let mut chunk = &mut hid_chunk[HID_PREFIX_ZERO..]; + let chunk = &mut hid_chunk[HID_PREFIX_ZERO..]; &mut chunk[0..5].copy_from_slice(&[0x01, 0x01, APDU_TAG, (chunk_index >> 8) as u8, (chunk_index & 0xff) as u8 ]); if chunk_index == 0 { diff --git a/hw/src/trezor.rs b/hw/src/trezor.rs index a89d26f66ac0366e0b7edff649bca002139a3f9b..a77d7233c42a4bc0707748dcaf9b97103de8c10b 100644 --- a/hw/src/trezor.rs +++ b/hw/src/trezor.rs @@ -37,8 +37,8 @@ use trezor_sys::messages::{EthereumAddress, PinMatrixAck, MessageType, EthereumT const TREZOR_VID: u16 = 0x534c; const TREZOR_PIDS: [u16; 1] = [0x0001]; // Trezor v1, keeping this as an array to leave room for Trezor v2 which is in progress -const ETH_DERIVATION_PATH: [u32; 4] = [0x8000002C, 0x8000003C, 0x80000000, 0]; // m/44'/60'/0'/0 -const ETC_DERIVATION_PATH: [u32; 4] = [0x8000002C, 0x8000003D, 0x80000000, 0]; // m/44'/61'/0'/0 +const ETH_DERIVATION_PATH: [u32; 5] = [0x8000002C, 0x8000003C, 0x80000000, 0, 0]; // m/44'/60'/0'/0/0 +const ETC_DERIVATION_PATH: [u32; 5] = [0x8000002C, 0x8000003D, 0x80000000, 0, 0]; // m/44'/61'/0'/0/0 /// Hardware wallet error. @@ -201,7 +201,7 @@ impl Manager { where F: Fn() -> Result { let mut err = Error::KeyNotFound; - /// Try to open device a few times. + // Try to open device a few times. for _ in 0..10 { match f() { Ok(handle) => return Ok(handle), diff --git a/ipc-common-types/Cargo.toml b/ipc-common-types/Cargo.toml deleted file mode 100644 index e00949adc56bbc066663cdcdebfd5e26094db7eb..0000000000000000000000000000000000000000 --- a/ipc-common-types/Cargo.toml +++ /dev/null @@ -1,16 +0,0 @@ -[package] -description = "Types that implement IPC and are common to multiple modules." -name = "ipc-common-types" -version = "1.9.0" -license = "GPL-3.0" -authors = ["Parity Technologies "] -build = "build.rs" - -[build-dependencies] -ethcore-ipc-codegen = { path = "../ipc/codegen" } - -[dependencies] -semver = "0.6" -ethcore-ipc = { path = "../ipc/rpc" } -ethcore-util = { path = "../util" } -ethcore-bigint = { path = "../util/bigint" } diff --git a/ipc/codegen/Cargo.toml b/ipc/codegen/Cargo.toml deleted file mode 100644 index 7b204869a9f5340e7bdf42bff1402f2a9c4bbe0b..0000000000000000000000000000000000000000 --- a/ipc/codegen/Cargo.toml +++ /dev/null @@ -1,26 +0,0 @@ -[package] -name = "ethcore-ipc-codegen" -version = "1.9.0" -authors = ["Parity Technologies "] -license = "GPL-3.0" -description = "Macros to auto-generate implementations for ipc call" -build = "build.rs" -keywords = ["ipc", "codegen"] - -[features] -default = ["with-syntex"] -nightly = ["quasi_macros"] -nightly-testing = ["clippy"] -with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] - -[build-dependencies] -quasi_codegen = { version = "0.32", optional = true } -syntex = { version = "0.58", optional = true } - -[dependencies] -aster = { version = "0.41", default-features = false } -clippy = { version = "^0.*", optional = true } -quasi = { version = "0.32", default-features = false } -quasi_macros = { version = "0.32", optional = true } -syntex = { version = "0.58", optional = true } -syntex_syntax = { version = "0.58", optional = true } diff --git a/ipc/codegen/src/codegen.rs b/ipc/codegen/src/codegen.rs deleted file mode 100644 index 2f4752d9716407f99e954183210960ba8803e542..0000000000000000000000000000000000000000 --- a/ipc/codegen/src/codegen.rs +++ /dev/null @@ -1,898 +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 . -use aster; - -use syntax::ast::{ - MetaItem, - Item, - ImplItemKind, - MethodSig, - Arg, - PatKind, - FunctionRetTy, - Ty, - TraitRef, - Ident, - Generics, - TraitItemKind, -}; - -use syntax::ast; -use syntax::codemap::Span; -use syntax::ext::base::{Annotatable, ExtCtxt}; -use syntax::ptr::P; - -pub struct Error; - -const RESERVED_MESSAGE_IDS: u16 = 16; - -pub fn expand_ipc_implementation( - cx: &mut ExtCtxt, - span: Span, - meta_item: &MetaItem, - annotatable: &Annotatable, - push: &mut FnMut(Annotatable) -) { - let item = match *annotatable { - Annotatable::Item(ref item) => item, - _ => { - cx.span_err(meta_item.span, "`#[ipc]` may only be applied to implementations and traits"); - return; - }, - }; - - let builder = aster::AstBuilder::new().span(span); - - let interface_map = match implement_interface(cx, &builder, &item, push, meta_item) { - Ok(interface_map) => interface_map, - Err(Error) => { return; }, - }; - - push_client(cx, &builder, &interface_map, push); - - push(Annotatable::Item(interface_map.item)); -} - -macro_rules! literal { - ($builder:ident, $($arg:tt)*) => { - $builder.expr().lit().str::<&str>(&format!($($arg)*)) - } -} - -fn field_name(builder: &aster::AstBuilder, arg: &Arg) -> ast::Ident { - match arg.pat.node { - PatKind::Ident(_, ref ident, _) => builder.id(ident.node), - _ => { panic!("unexpected param in interface: {:?}", arg.pat.node) } - } -} - -pub fn replace_slice_u8(builder: &aster::AstBuilder, ty: &P) -> P { - if ::syntax::print::pprust::ty_to_string(&strip_ptr(ty)) == "[u8]" { - return builder.ty().id("Vec") - } - ty.clone() -} - -struct NamedSignature<'a> { - sig: &'a MethodSig, - ident: &'a Ident, -} - -fn push_invoke_signature_aster( - builder: &aster::AstBuilder, - named_signature: &NamedSignature, - push: &mut FnMut(Annotatable), -) -> Dispatch { - let inputs = &named_signature.sig.decl.inputs; - let (input_type_name, input_arg_names, input_arg_tys) = if inputs.len() > 0 { - let first_field_name = field_name(builder, &inputs[0]).name.as_str(); - if &*first_field_name == "self" && inputs.len() == 1 { (None, vec![], vec![]) } - else { - let skip = if &*first_field_name == "self" { 2 } else { 1 }; - let name_str = format!("{}_input", named_signature.ident.name.as_str()); - - let mut arg_names = Vec::new(); - let mut arg_tys = Vec::new(); - - let arg_name = format!("{}", field_name(builder, &inputs[skip-1]).name); - let arg_ty = &inputs[skip-1].ty; - - let mut tree = builder.item() - .attr().word("binary") - .attr().word("allow(non_camel_case_types)") - .struct_(name_str.as_str()) - .field(arg_name.as_str()) - .ty().build(replace_slice_u8(builder, &strip_ptr(arg_ty))); - - arg_names.push(arg_name); - arg_tys.push(arg_ty.clone()); - for arg in inputs.iter().skip(skip) { - let arg_name = format!("{}", field_name(builder, &arg)); - let arg_ty = &arg.ty; - - tree = tree.field(arg_name.as_str()).ty().build(replace_slice_u8(builder, &strip_ptr(arg_ty))); - arg_names.push(arg_name); - arg_tys.push(arg_ty.clone()); - } - - push(Annotatable::Item(tree.build())); - (Some(name_str.to_owned()), arg_names, arg_tys) - } - } - else { - (None, vec![], vec![]) - }; - - let return_type_ty = match named_signature.sig.decl.output { - FunctionRetTy::Ty(ref ty) => { - let name_str = format!("{}_output", named_signature.ident.name.as_str()); - let tree = builder.item() - .attr().word("binary") - .attr().word("allow(non_camel_case_types)") - .struct_(name_str.as_str()) - .field(format!("payload")).ty().build(ty.clone()); - push(Annotatable::Item(tree.build())); - Some(ty.clone()) - } - _ => None - }; - - Dispatch { - function_name: format!("{}", named_signature.ident.name.as_str()), - input_type_name: input_type_name, - input_arg_names: input_arg_names, - input_arg_tys: input_arg_tys, - return_type_ty: return_type_ty, - } -} - -struct Dispatch { - function_name: String, - input_type_name: Option, - input_arg_names: Vec, - input_arg_tys: Vec>, - return_type_ty: Option>, -} - -// This is the expanded version of this: -// -// let invoke_serialize_stmt = quote_stmt!(cx, { -// ::bincode::serde::serialize(& $output_type_id { payload: self. $function_name ($hand_param_a, $hand_param_b) }, ::bincode::SizeLimit::Infinite).unwrap() -// }); -// -// But the above does not allow comma-separated expressions for arbitrary number -// of parameters ...$hand_param_a, $hand_param_b, ... $hand_param_n -fn implement_dispatch_arm_invoke_stmt( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - dispatch: &Dispatch, -) -> ast::Stmt -{ - use ::syntax::tokenstream::TokenTree::Token; - let function_name = builder.id(dispatch.function_name.as_str()); - - let input_args_exprs = dispatch.input_arg_names.iter().enumerate().map(|(arg_index, arg_name)| { - let arg_ident = builder.id(arg_name); - let expr = quote_expr!(cx, input. $arg_ident); - if has_ptr(&dispatch.input_arg_tys[arg_index]) { quote_expr!(cx, & $expr) } - else { expr } - }).collect::>>(); - - let ext_cx = &*cx; - ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( - ext_cx.parse_sess(), - { - let _sp = ext_cx.call_site(); - let mut tt = ::std::vec::Vec::new(); - - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); - - if dispatch.return_type_ty.is_some() { - tt.push(Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("ipc")))); - tt.push(Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("binary")))); - tt.push(Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("serialize")))); - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - } - - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); - tt.push(Token(_sp, ::syntax::parse::token::Dot)); - tt.extend(::quasi::ToTokens::to_tokens(&function_name, ext_cx).into_iter()); - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - - for arg_expr in input_args_exprs { - tt.extend(::quasi::ToTokens::to_tokens(&arg_expr, ext_cx).into_iter()); - tt.push(Token(_sp, ::syntax::parse::token::Comma)); - } - - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); - - if dispatch.return_type_ty.is_some() { - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); - tt.push(Token(_sp, ::syntax::parse::token::Dot)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("unwrap")))); - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); - } - else { - tt.push(Token(_sp, ::syntax::parse::token::Semi)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Vec")))); - tt.push(Token(_sp, ::syntax::parse::token::ModSep)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("new")))); - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); - - } - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); - - tt - } - )).unwrap() -} - -fn implement_dispatch_arm_invoke( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - dispatch: &Dispatch, - buffer: bool, -) -> P -{ - let deserialize_expr = if buffer { - quote_expr!(cx, - ::ipc::binary::deserialize(buf) - .unwrap_or_else(|e| { panic!("ipc error while deserializing payload, aborting \n payload: {:?}, \n error: {:?}", buf, e); } ) - ) - } else { - quote_expr!(cx, - ::ipc::binary::deserialize_from(r) - .unwrap_or_else(|e| { panic!("ipc error while deserializing payload, aborting \n error: {:?}", e); } ) - ) - }; - - let invoke_serialize_stmt = implement_dispatch_arm_invoke_stmt(cx, builder, dispatch); - dispatch.input_type_name.as_ref().map(|val| { - let input_type_id = builder.id(val.clone().as_str()); - quote_expr!(cx, { - let input: $input_type_id = $deserialize_expr; - $invoke_serialize_stmt - }) - }).unwrap_or(quote_expr!(cx, { $invoke_serialize_stmt })) -} - -/// generates dispatch match for method id -fn implement_dispatch_arm( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - index: u32, - dispatch: &Dispatch, - buffer: bool, -) -> ast::Arm -{ - let index_ident = builder.id(format!("{}", index + (RESERVED_MESSAGE_IDS as u32)).as_str()); - let invoke_expr = implement_dispatch_arm_invoke(cx, builder, dispatch, buffer); - let trace = literal!(builder, "Dispatching: {}", &dispatch.function_name); - quote_arm!(cx, $index_ident => { - trace!(target: "ipc", $trace); - $invoke_expr - }) -} - -fn implement_dispatch_arms( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - dispatches: &[Dispatch], - buffer: bool, -) -> Vec -{ - let mut index = -1; - dispatches.iter() - .map(|dispatch| { index = index + 1; implement_dispatch_arm(cx, builder, index as u32, dispatch, buffer) }).collect() -} - -pub fn strip_ptr(ty: &P) -> P { - if let ast::TyKind::Rptr(_, ref ptr_mut) = ty.node { - ptr_mut.ty.clone() - } - else { ty.clone() } -} - -pub fn has_ptr(ty: &P) -> bool { - if let ast::TyKind::Rptr(_, ref _ptr_mut) = ty.node { - true - } - else { false } -} - -/// returns an expression with the body for single operation that is being sent to server -/// operation itself serializes input, writes to socket and waits for socket to respond -/// (the latter only if original method signature returns anyting) -/// -/// assuming expanded class contains method -/// fn commit(&self, f: u32) -> u32 -/// -/// the expanded implementation will generate method for the client like that -/// #[binary] -/// struct Request<'a> { -/// f: &'a u32, -/// } -/// let payload = Request{f: &f,}; -/// let mut socket_ref = self.socket.borrow_mut(); -/// let mut socket = socket_ref.deref_mut(); -/// let serialized_payload = ::bincode::serde::serialize(&payload, ::bincode::SizeLimit::Infinite).unwrap(); -/// ::ipc::invoke(0, &Some(serialized_payload), &mut socket); -/// while !socket.ready().load(::std::sync::atomic::Ordering::Relaxed) { } -/// ::bincode::serde::deserialize_from::<_, u32>(&mut socket, ::bincode::SizeLimit::Infinite).unwrap() -fn implement_client_method_body( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - index: u16, - interface_map: &InterfaceMap, -) -> P -{ - use ::syntax::tokenstream::TokenTree::Token; - - let dispatch = &interface_map.dispatches[index as usize]; - let index_ident = builder.id(format!("{}", index + RESERVED_MESSAGE_IDS).as_str()); - - let request = if dispatch.input_arg_names.len() > 0 { - - let arg_name = dispatch.input_arg_names[0].as_str(); - let static_ty = strip_ptr(&dispatch.input_arg_tys[0]); - let arg_ty = builder - .ty().ref_() - .lifetime("'a") - .ty() - .build(static_ty.clone()); - - let mut tree = builder.item() - .attr().word("binary") - .struct_("Request") - .generics() - .lifetime_name("'a") - .build() - .field(arg_name).ty() - .build(arg_ty); - - for arg_idx in 1..dispatch.input_arg_names.len() { - let arg_name = dispatch.input_arg_names[arg_idx].as_str(); - let static_ty = strip_ptr(&dispatch.input_arg_tys[arg_idx]); - - let arg_ty = builder - .ty().ref_() - .lifetime("'a") - .ty() - .build(static_ty); - tree = tree.field(arg_name).ty().build(arg_ty); - - } - let mut request_serialization_statements = Vec::new(); - - let struct_tree = tree.build(); - let struct_stmt = quote_stmt!(cx, $struct_tree); - request_serialization_statements.push(struct_stmt); - - // actually this is just expanded version of this: - // request_serialization_statements.push(quote_stmt!(cx, let payload = Request { p1: &p1, p2: &p2, ... pn: &pn, })); - // again, cannot dynamically create expression with arbitrary number of comma-separated members - request_serialization_statements.push({ - let ext_cx = &*cx; - ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( - ext_cx.parse_sess(), - { - let _sp = ext_cx.call_site(); - let mut tt = ::std::vec::Vec::new(); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("let")))); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("payload")))); - tt.push(Token(_sp, ::syntax::parse::token::Eq)); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("Request")))); - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); - - for arg in dispatch.input_arg_names.iter() { - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); - tt.push(Token(_sp, ::syntax::parse::token::Colon)); - tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg.as_str())))); - tt.push(Token(_sp, ::syntax::parse::token::Comma)); - } - - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); - tt - })) - }); - - request_serialization_statements.push( - quote_stmt!(cx, let mut socket = self.socket.write().unwrap(); )); - - request_serialization_statements.push( - quote_stmt!(cx, let serialized_payload = ::ipc::binary::serialize(&payload).unwrap())); - - request_serialization_statements.push( - quote_stmt!(cx, ::ipc::invoke($index_ident, &Some(serialized_payload), &mut *socket))); - - - request_serialization_statements - } - else { - let mut request_serialization_statements = Vec::new(); - request_serialization_statements.push( - quote_stmt!(cx, let mut socket = self.socket.write().unwrap(); )); - request_serialization_statements.push( - quote_stmt!(cx, ::ipc::invoke($index_ident, &None, &mut *socket))); - request_serialization_statements - }; - - let trace = literal!(builder, "Invoking: {}", &dispatch.function_name); - if let Some(ref return_ty) = dispatch.return_type_ty { - let return_expr = quote_expr!(cx, - ::ipc::binary::deserialize_from::<$return_ty, _>(&mut *socket).unwrap() - ); - quote_expr!(cx, { - trace!(target: "ipc", $trace); - $request; - $return_expr - }) - } - else { - quote_expr!(cx, { - trace!(target: "ipc", $trace); - $request - }) - } -} - -/// Generates signature and body (see `implement_client_method_body`) -/// for the client (signature is identical to the original method) -fn implement_client_method( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - index: u16, - interface_map: &InterfaceMap, -) - -> ast::ImplItem -{ - use ::syntax::tokenstream::TokenTree::Token; - - let dispatch = &interface_map.dispatches[index as usize]; - let method_name = builder.id(dispatch.function_name.as_str()); - let body = implement_client_method_body(cx, builder, index, interface_map); - - let ext_cx = &*cx; - // expanded version of this - // pub fn $method_name(&self, p1: p1_ty, p2: p2_ty ... pn: pn_ty, ) [-> return_ty] { $body } - // looks like it's tricky to build function declaration with aster if body already generated - let signature = ::syntax::parse::parser::Parser::parse_impl_item( - &mut ::syntax::parse::new_parser_from_tts( - ext_cx.parse_sess(), - { - let _sp = ext_cx.call_site(); - let mut tt = ::std::vec::Vec::new(); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("fn")))); - tt.extend(::quasi::ToTokens::to_tokens(&method_name, ext_cx).into_iter()); - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Paren))); - tt.push(Token(_sp, ::syntax::parse::token::BinOp(::syntax::parse::token::And))); - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of("self")))); - tt.push(Token(_sp, ::syntax::parse::token::Comma)); - - for arg_idx in 0..dispatch.input_arg_names.len() { - let arg_name = dispatch.input_arg_names[arg_idx].as_str(); - let arg_ty = dispatch.input_arg_tys[arg_idx].clone(); - - tt.push(Token(_sp, ::syntax::parse::token::Ident(ext_cx.ident_of(arg_name)))); - tt.push(Token(_sp, ::syntax::parse::token::Colon)); - tt.extend(::quasi::ToTokens::to_tokens(&arg_ty, ext_cx).into_iter()); - tt.push(Token(_sp, ::syntax::parse::token::Comma)); - } - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Paren))); - - if let Some(ref return_ty) = dispatch.return_type_ty { - tt.push(Token(_sp, ::syntax::parse::token::RArrow)); - tt.extend(::quasi::ToTokens::to_tokens(return_ty, ext_cx).into_iter()); - } - - tt.push(Token(_sp, ::syntax::parse::token::OpenDelim(::syntax::parse::token::Brace))); - tt.extend(::quasi::ToTokens::to_tokens(&body, ext_cx).into_iter()); - tt.push(Token(_sp, ::syntax::parse::token::CloseDelim(::syntax::parse::token::Brace))); - - tt - })); - - signature.unwrap() -} - -fn client_generics(builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> Generics { - let ty_param = aster::ty_param::TyParamBuilder::new( - builder.id("S")).trait_bound( - builder.path().global().ids(&["ipc", "IpcSocket"]).build() - ).build().build(); - - builder.from_generics(interface_map.generics.clone()) - .with_ty_param(ty_param) - .build() -} - -fn client_qualified_ident(cx: &ExtCtxt, builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> P { - let generics = client_generics(builder, interface_map); - aster::ty::TyBuilder::new().path().segment(interface_map.ident_map.client_ident(cx, builder)) - .with_generics(generics).build() - .build() -} - -fn client_phantom_ident(builder: &aster::AstBuilder, interface_map: &InterfaceMap) -> P { - let generics = client_generics(builder, interface_map); - aster::ty::TyBuilder::new().phantom_data() - .tuple().with_tys(generics.ty_params.iter().map(|x| aster::ty::TyBuilder::new().id(x.ident))) - .build() -} - -/// generates client type for specified server type -/// for say `Service` it generates `ServiceClient` -fn push_client_struct(cx: &ExtCtxt, builder: &aster::AstBuilder, interface_map: &InterfaceMap, push: &mut FnMut(Annotatable)) { - let generics = client_generics(builder, interface_map); - let client_short_ident = interface_map.ident_map.client_ident(cx, builder); - let phantom = client_phantom_ident(builder, interface_map); - - let client_struct_item = quote_item!(cx, - pub struct $client_short_ident $generics { - socket: ::std::sync::RwLock, - phantom: $phantom, - }); - - push(Annotatable::Item(client_struct_item.expect(&format!("could not generate client struct for {:?}", client_short_ident.name)))); -} - -/// pushes generated code for the client class (type declaration and method invocation implementations) -fn push_client( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - interface_map: &InterfaceMap, - push: &mut FnMut(Annotatable), -) { - push_client_struct(cx, builder, interface_map, push); - push_client_implementation(cx, builder, interface_map, push); - push_with_socket_client_implementation(cx, builder, interface_map, push); -} - -fn push_with_socket_client_implementation( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - interface_map: &InterfaceMap, - push: &mut FnMut(Annotatable)) -{ - let generics = client_generics(builder, interface_map); - let client_ident = client_qualified_ident(cx, builder, interface_map); - let where_clause = &generics.where_clause; - let client_short_ident = interface_map.ident_map.client_ident(cx, builder); - - let implement = quote_item!(cx, - impl $generics ::ipc::WithSocket for $client_ident $where_clause { - fn init(socket: S) -> $client_ident { - $client_short_ident { - socket: ::std::sync::RwLock::new(socket), - phantom: ::std::marker::PhantomData, - } - } - }).unwrap(); - push(Annotatable::Item(implement)); -} - -/// pushes full client side code for the original class exposed via ipc -fn push_client_implementation( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - interface_map: &InterfaceMap, - push: &mut FnMut(Annotatable), -) { - let mut index = -1i32; - let items = interface_map.dispatches.iter() - .map(|_| { index = index + 1; P(implement_client_method(cx, builder, index as u16, interface_map)) }) - .collect::>>(); - - let generics = client_generics(builder, interface_map); - let client_ident = client_qualified_ident(cx, builder, interface_map); - let where_clause = &generics.where_clause; - let endpoint = interface_map.endpoint; - - let handshake_item = quote_impl_item!(cx, - pub fn handshake(&self) -> Result<(), ::ipc::Error> { - let payload = ::ipc::Handshake { - protocol_version: $endpoint::protocol_version(), - api_version: $endpoint::api_version(), - }; - - ::ipc::invoke( - 0, - &Some(::ipc::binary::serialize(&::ipc::BinHandshake::from(payload)).unwrap()), - &mut *self.socket.write().unwrap()); - - let mut result = vec![0u8; 1]; - if try!(self.socket.write().unwrap().read(&mut result).map_err(|_| ::ipc::Error::HandshakeFailed)) == 1 { - match result[0] { - 1 => Ok(()), - _ => Err(::ipc::Error::RemoteServiceUnsupported), - } - } - else { Err(::ipc::Error::HandshakeFailed) } - }).unwrap(); - - let socket_item = quote_impl_item!(cx, - #[cfg(test)] - pub fn socket(&self) -> &::std::sync::RwLock { - &self.socket - }).unwrap(); - - let generic_items = vec![P(handshake_item), P(socket_item)]; - - if interface_map.impl_trait.is_some() { - let trait_ty = builder.id( - ::syntax::print::pprust::path_to_string( - &interface_map.impl_trait.as_ref().unwrap().path)); - - let implement_trait = - quote_item!(cx, - impl $generics $trait_ty for $client_ident $where_clause { - $items - } - ).unwrap(); - push(Annotatable::Item(implement_trait)); - - let implement = - quote_item!(cx, - impl $generics $client_ident $where_clause { - $generic_items - } - ).unwrap(); - push(Annotatable::Item(implement)); - } - else { - let pub_items = items.iter().map(|item| { - let pub_item = item.clone(); - pub_item.map(|mut val| { val.vis = ast::Visibility::Public; val }) - }).collect::>>(); - - let implement = quote_item!(cx, - impl $generics $client_ident $where_clause { - $pub_items - $generic_items - }).unwrap(); - push(Annotatable::Item(implement)); - } - -} - -/// implements dispatching of system handshake invocation (method_num 0) -fn implement_handshake_arm( - cx: &ExtCtxt, -) -> (ast::Arm, ast::Arm) -{ - let handshake_deserialize = quote_stmt!(&cx, - let handshake_payload = ::ipc::binary::deserialize_from::<::ipc::BinHandshake, _>(r).unwrap(); - ); - - let handshake_deserialize_buf = quote_stmt!(&cx, - let handshake_payload = ::ipc::binary::deserialize::<::ipc::BinHandshake>(buf).unwrap(); - ); - - let handshake_serialize = quote_expr!(&cx, - ::ipc::binary::serialize::(&Self::handshake(&handshake_payload.to_semver())).unwrap() - ); - - ( - quote_arm!(&cx, 0 => { - $handshake_deserialize - $handshake_serialize - }), - quote_arm!(&cx, 0 => { - $handshake_deserialize_buf - $handshake_serialize - }), - ) -} - -fn get_str_from_lit(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result { - match lit.node { - ast::LitKind::Str(ref s, _) => Ok(format!("{}", s)), - _ => { - cx.span_err( - lit.span, - &format!("ipc client_ident annotation `{}` must be a string, not `{}`", - name, - ::syntax::print::pprust::lit_to_string(lit))); - - return Err(()); - } - } -} - -fn client_ident_renamed(cx: &ExtCtxt, meta_item: &MetaItem) -> Option { - if let ast::MetaItemKind::List(ref list) = meta_item.node { - for nested in list { - match nested.node { - ast::NestedMetaItemKind::MetaItem(ref meta_item) => { - let is_client_ident = &*meta_item.name.as_str() == "client_ident"; - match meta_item.node { - ast::MetaItemKind::NameValue(ref lit) if is_client_ident => { - if let Ok(s) = get_str_from_lit(cx, "client_ident", lit) { - return Some(s); - } - } - _ => { - cx.span_err( - meta_item.span, - &format!("unknown client_ident container attribute `{}`", - ::syntax::print::pprust::meta_item_to_string(&meta_item))); - } - } - }, - _ => {}, - } - } - } - - None -} - -struct InterfaceMap { - pub original_item: Item, - pub item: P, - pub dispatches: Vec, - pub generics: Generics, - pub impl_trait: Option, - pub ident_map: IdentMap, - pub endpoint: Ident, -} - -struct IdentMap { - original_path: ast::Path, - meta_item: MetaItem, -} - -impl IdentMap { - fn ident(&self, builder: &aster::AstBuilder) -> Ident { - builder.id(format!("{}", ::syntax::print::pprust::path_to_string(&self.original_path))) - } - - fn client_ident(&self, cx: &ExtCtxt, builder: &aster::AstBuilder) -> Ident { - if let Some(new_name) = client_ident_renamed(cx, &self.meta_item) { - builder.id(new_name) - } - else { - builder.id(format!("{}Client", self.original_path.segments[0].identifier)) - } - } -} - -fn ty_ident_map(original_ty: &P, meta_item: &MetaItem) -> IdentMap { - let original_path = match original_ty.node { - ::syntax::ast::TyKind::Path(_, ref path) => path.clone(), - _ => { panic!("incompatible implementation"); } - }; - let ident_map = IdentMap { original_path: original_path, meta_item: meta_item.clone() }; - ident_map -} - -/// implements `IpcInterface` for the given class `C` -fn implement_interface( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - item: &Item, - push: &mut FnMut(Annotatable), - meta_item: &MetaItem, -) -> Result { - let (generics, impl_trait, original_ty, dispatch_table) = match item.node { - ast::ItemKind::Impl(_, _, ref generics, ref impl_trait, ref ty, ref impl_items) => { - let mut method_signatures = Vec::new(); - for impl_item in impl_items { - if let ImplItemKind::Method(ref signature, _) = impl_item.node { - method_signatures.push(NamedSignature { ident: &impl_item.ident, sig: signature }); - } - } - - let dispatch_table = method_signatures.iter().map(|named_signature| - push_invoke_signature_aster(builder, named_signature, push)) - .collect::>(); - - (generics, impl_trait.clone(), ty.clone(), dispatch_table) - }, - ast::ItemKind::Trait(_, ref generics, _, ref trait_items) => { - let mut method_signatures = Vec::new(); - for trait_item in trait_items { - if let TraitItemKind::Method(ref signature, _) = trait_item.node { - method_signatures.push(NamedSignature { ident: &trait_item.ident, sig: signature }); - } - } - - let dispatch_table = method_signatures.iter().map(|named_signature| - push_invoke_signature_aster(builder, named_signature, push)) - .collect::>(); - - ( - generics, - Some(ast::TraitRef { - path: builder.path().ids(&[item.ident.name]).build(), - ref_id: item.id, - }), - builder.ty().id(item.ident), - dispatch_table - ) - }, - _ => { - cx.span_err( - item.span, - "`#[ipc]` may only be applied to implementations and traits"); - return Err(Error); - }, - }; - let impl_generics = builder.from_generics(generics.clone()).build(); - let where_clause = &impl_generics.where_clause; - - let dispatch_arms = implement_dispatch_arms(cx, builder, &dispatch_table, false); - let dispatch_arms_buffered = implement_dispatch_arms(cx, builder, &dispatch_table, true); - - let (handshake_arm, handshake_arm_buf) = implement_handshake_arm(cx); - - let ty = ty_ident_map(&original_ty, meta_item).ident(builder); - let (interface_endpoint, host_generics) = match impl_trait { - Some(ref trait_) => (builder.id(::syntax::print::pprust::path_to_string(&trait_.path)), None), - None => (ty, Some(&impl_generics)), - }; - - let ipc_item = quote_item!(cx, - impl $host_generics ::ipc::IpcInterface for $interface_endpoint $where_clause { - fn dispatch(&self, r: &mut R) -> Vec - where R: ::std::io::Read - { - let mut method_num = vec![0u8;2]; - match r.read(&mut method_num) { - Ok(size) if size == 0 => { panic!("method id not supplied" ); } - Err(e) => { panic!("ipc read error: {:?}, aborting", e); } - _ => { } - } - - // method_num is a 16-bit little-endian unsigned number - match method_num[1] as u16 + (method_num[0] as u16)*256 { - // handshake - $handshake_arm - // user methods - $dispatch_arms - _ => vec![] - } - } - - fn dispatch_buf(&self, method_num: u16, buf: &[u8]) -> Vec - { - match method_num { - $handshake_arm_buf - $dispatch_arms_buffered - _ => vec![] - } - } - } - ).unwrap(); - - Ok(InterfaceMap { - ident_map: ty_ident_map(&original_ty, meta_item), - original_item: item.clone(), - item: ipc_item, - dispatches: dispatch_table, - generics: generics.clone(), - impl_trait: impl_trait.clone(), - endpoint: interface_endpoint, - }) -} diff --git a/ipc/codegen/src/lib.rs b/ipc/codegen/src/lib.rs deleted file mode 100644 index 6e7fc441b324f217ce883b4d184e463f25061c74..0000000000000000000000000000000000000000 --- a/ipc/codegen/src/lib.rs +++ /dev/null @@ -1,237 +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 . - -//! Codegen for IPC RPC - -#![cfg_attr(feature = "nightly-testing", plugin(clippy))] -#![cfg_attr(feature = "nightly-testing", feature(plugin))] -#![cfg_attr(feature = "nightly-testing", allow(used_underscore_binding))] -#![cfg_attr(not(feature = "with-syntex"), feature(rustc_private, plugin))] -#![cfg_attr(not(feature = "with-syntex"), plugin(quasi_macros))] - -extern crate aster; -extern crate quasi; - -#[cfg(feature = "with-syntex")] -extern crate syntex; - -#[cfg(feature = "with-syntex")] -extern crate syntex_syntax as syntax; - -#[cfg(not(feature = "with-syntex"))] -#[macro_use] -extern crate syntax; - -#[cfg(not(feature = "with-syntex"))] -extern crate rustc_plugin; - -#[cfg(not(feature = "with-syntex"))] -use syntax::feature_gate::AttributeType; - -#[cfg(feature = "with-syntex")] -use syntax::{ast, fold}; - - -#[cfg(feature = "with-syntex")] -include!(concat!(env!("OUT_DIR"), "/lib.rs")); - -#[cfg(not(feature = "with-syntex"))] -include!("lib.rs.in"); - -#[cfg(feature = "with-syntex")] -pub fn expand(src: &std::path::Path, dst: &std::path::Path) { - let mut registry = syntex::Registry::new(); - register(&mut registry); - registry.expand("", src, dst).unwrap(); -} - -#[cfg(feature = "with-syntex")] -struct StripAttributeFolder<'a> { - attr_title: &'a str, -} - -#[cfg(feature = "with-syntex")] -impl<'a> fold::Folder for StripAttributeFolder<'a> { - fn fold_attribute(&mut self, attr: ast::Attribute) -> Option { - let is_self = &*attr.value.name.as_str() == self.attr_title; - - match attr.value.node { - ast::MetaItemKind::List(_) if is_self => { return None; } - ast::MetaItemKind::Word if is_self => { return None; } - _ => {} - } - - Some(attr) - } - - fn fold_mac(&mut self, mac: ast::Mac) -> ast::Mac { - fold::noop_fold_mac(mac, self) - } -} - -#[cfg(feature = "with-syntex")] -pub fn register_cleaner_ipc(reg: &mut syntex::Registry) { - #[cfg(feature = "with-syntex")] - fn strip_attributes(krate: ast::Crate) -> ast::Crate { - let mut folder = StripAttributeFolder { attr_title: "ipc" }; - fold::Folder::fold_crate(&mut folder, krate) - } - - reg.add_post_expansion_pass(strip_attributes); -} - -#[cfg(feature = "with-syntex")] -pub fn register_cleaner_binary(reg: &mut syntex::Registry) { - #[cfg(feature = "with-syntex")] - fn strip_attributes(krate: ast::Crate) -> ast::Crate { - let mut folder = StripAttributeFolder { attr_title: "binary" }; - fold::Folder::fold_crate(&mut folder, krate) - } - - reg.add_post_expansion_pass(strip_attributes); -} - -#[cfg(feature = "with-syntex")] -pub fn register(reg: &mut syntex::Registry) { - reg.add_attr("feature(custom_derive)"); - reg.add_attr("feature(custom_attribute)"); - - reg.add_decorator("ipc", codegen::expand_ipc_implementation); - reg.add_decorator("binary", serialization::expand_serialization_implementation); - - register_cleaner_ipc(reg); - register_cleaner_binary(reg); -} - -#[cfg(not(feature = "with-syntex"))] -pub fn register(reg: &mut rustc_plugin::Registry) { - reg.register_syntax_extension( - syntax::parse::token::intern("ipc"), - syntax::ext::base::MultiDecorator( - Box::new(codegen::expand_ipc_implementation))); - reg.register_syntax_extension( - syntax::parse::token::intern("binary"), - syntax::ext::base::MultiDecorator( - Box::new(serialization::expand_serialization_implementation))); - - reg.register_attribute("ipc".to_owned(), AttributeType::Normal); - reg.register_attribute("binary".to_owned(), AttributeType::Normal); -} - -#[derive(Debug)] -pub enum Error { InvalidFileName, ExpandFailure, Io(std::io::Error) } - -impl std::convert::From for Error { - fn from(err: std::io::Error) -> Self { - Error::Io(err) - } -} - -pub fn derive_ipc_cond(src_path: &str, has_feature: bool) -> Result<(), Error> { - if has_feature { derive_ipc(src_path) } - else { cleanup_ipc(src_path) } -} - -pub fn cleanup_ipc(src_path: &str) -> Result<(), Error> { - cleanup(src_path, AttributeKind::Ipc) -} - -pub fn cleanup_binary(src_path: &str) -> Result<(), Error> { - cleanup(src_path, AttributeKind::Binary) -} - -enum AttributeKind { - Ipc, - Binary, -} - -fn cleanup(src_path: &str, attr: AttributeKind) -> Result<(), Error> { - use std::env; - use std::path::{Path, PathBuf}; - - let out_dir = env::var_os("OUT_DIR").unwrap(); - let file_name = PathBuf::from(src_path).file_name().ok_or(Error::InvalidFileName).map(|val| val.to_str().unwrap().to_owned())?; - let mut registry = syntex::Registry::new(); - - match attr { - AttributeKind::Ipc => { register_cleaner_ipc(&mut registry); } - AttributeKind::Binary => { register_cleaner_binary(&mut registry); } - } - - if let Err(_) = registry.expand("", &Path::new(src_path), &Path::new(&out_dir).join(&file_name)) - { - // will be reported by compiler - return Err(Error::ExpandFailure) - } - Ok(()) -} - -pub fn derive_ipc(src_path: &str) -> Result<(), Error> { - use std::env; - use std::path::{Path, PathBuf}; - - let out_dir = env::var_os("OUT_DIR").unwrap(); - let file_name = PathBuf::from(src_path).file_name().ok_or(Error::InvalidFileName).map(|val| val.to_str().unwrap().to_owned())?; - - let final_path = Path::new(&out_dir).join(&file_name); - - let mut intermediate_file_name = file_name.clone(); - intermediate_file_name.push_str(".rpc.in"); - let intermediate_path = Path::new(&out_dir).join(&intermediate_file_name); - - { - let mut registry = syntex::Registry::new(); - register(&mut registry); - if let Err(_) = registry.expand("", &Path::new(src_path), &intermediate_path) { - // will be reported by compiler - return Err(Error::ExpandFailure) - } - } - - { - let mut registry = syntex::Registry::new(); - register(&mut registry); - if let Err(_) = registry.expand("", &intermediate_path, &final_path) { - // will be reported by compiler - return Err(Error::ExpandFailure) - } - } - - Ok(()) -} - -pub fn derive_binary(src_path: &str) -> Result<(), Error> { - use std::env; - use std::path::{Path, PathBuf}; - - let out_dir = env::var_os("OUT_DIR").unwrap(); - let file_name = PathBuf::from(src_path).file_name().ok_or(Error::InvalidFileName).map(|val| val.to_str().unwrap().to_owned())?; - let final_path = Path::new(&out_dir).join(&file_name); - - let mut registry = syntex::Registry::new(); - register(&mut registry); - if let Err(_) = registry.expand("", &Path::new(src_path), &final_path) { - // will be reported by compiler - return Err(Error::ExpandFailure) - } - - Ok(()) -} - -pub fn derive_binary_cond(src_path: &str, has_feature: bool) -> Result<(), Error> { - if has_feature { derive_binary(src_path) } - else { cleanup_binary(src_path) } -} diff --git a/ipc/codegen/src/serialization.rs b/ipc/codegen/src/serialization.rs deleted file mode 100644 index fd908725c9b54e98b46d94d81ff5616f55a19df2..0000000000000000000000000000000000000000 --- a/ipc/codegen/src/serialization.rs +++ /dev/null @@ -1,810 +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 . -use aster; - -use syntax::ast::{ - MetaItem, - Item, - Ident, -}; - -use syntax::ast; -use syntax::codemap::Span; -use syntax::ext::base::{Annotatable, ExtCtxt}; -use syntax::ptr::P; - -pub struct Error; - -use super::codegen; - -pub fn expand_serialization_implementation( - cx: &mut ExtCtxt, - span: Span, - meta_item: &MetaItem, - annotatable: &Annotatable, - push: &mut FnMut(Annotatable) -) { - let item = match *annotatable { - Annotatable::Item(ref item) => item, - _ => { - cx.span_err(meta_item.span, "`#[derive(Binary)]` may only be applied to structs and enums"); - return; - }, - }; - - let builder = aster::AstBuilder::new().span(span); - - let impl_item = match serialize_item(cx, &builder, &item) { - Ok(item) => item, - Err(Error) => { - // An error occurred, but it should have been reported already. - return; - }, - }; - - push(Annotatable::Item(impl_item)) -} - -fn serialize_item( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - item: &Item, -) -> Result, Error> { - let generics = match item.node { - ast::ItemKind::Struct(_, ref generics) => generics, - ast::ItemKind::Enum(_, ref generics) => generics, - _ => { - cx.span_err( - item.span, - "`#[derive(Binary)]` may only be applied to structs and enums"); - return Err(Error); - }, - }; - - let ty = builder.ty().path() - .segment(item.ident).with_generics(generics.clone()).build() - .build(); - - let where_clause = &generics.where_clause; - - let binary_expressions = try!(binary_expr(cx, - &builder, - &item, - &generics, - ty.clone())); - - let (size_expr, read_expr, write_expr) = - (binary_expressions.size, binary_expressions.read, binary_expressions.write); - - match quote_item!(cx, - impl $generics ::ipc::BinaryConvertable for $ty $where_clause { - fn size(&self) -> usize { - $size_expr - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut ::std::collections::VecDeque) -> Result<(), ::ipc::BinaryConvertError> { - $write_expr - } - - fn from_bytes(buffer: &[u8], length_stack: &mut ::std::collections::VecDeque) -> Result { - $read_expr - } - - fn len_params() -> usize { - 1 - } - }) - { - Some(item) => Ok(item), - None => { - cx.span_err( - item.span, - "syntax error expanding serialization implementation"); - Err(Error) - } - } -} - -#[allow(unreachable_code)] -fn binary_expr( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - item: &Item, - impl_generics: &ast::Generics, - ty: P, -) -> Result { - match item.node { - ast::ItemKind::Struct(ref variant_data, _) => { - binary_expr_item_struct( - cx, - builder, - impl_generics, - ty, - item.span, - variant_data, - ) - }, - ast::ItemKind::Enum(ref enum_def, _) => { - binary_expr_enum( - cx, - builder, - item.ident, - impl_generics, - ty, - item.span, - enum_def, - ) - }, - _ => { - cx.span_bug(item.span, - "expected ItemStruct or ItemEnum in #[derive(Binary)]"); - Err(Error) as Result - }, - } -} - -struct BinaryExpressions { - pub size: P, - pub write: P, - pub read: P, -} - -fn replace_qualified(s: &str) -> String { - if let Some(pos) = s.find("<") { - let mut source = s.to_owned(); - source.insert(pos, ':'); - source.insert(pos, ':'); - source - } - else { s.to_owned() } -} - -fn binary_expr_struct( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - ty: P, - fields: &[ast::StructField], - value_ident: Option, - instance_ident: Option, -) -> Result { - - let size_exprs: Vec> = fields.iter().enumerate().map(|(index, field)| { - let raw_ident = ::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)); - let index_ident = builder.id(format!("__field{}", index)); - let field_id = match field.ident { - Some(ident) => builder.id(ident), - None => builder.id(format!("{}", index)), - }; - - match raw_ident.as_ref() { - "u8" => { - quote_expr!(cx, 1) - }, - "[u8]" => { - value_ident.and_then(|x| { - Some(quote_expr!(cx, $x. $field_id .len())) - }) - .unwrap_or_else(|| { - quote_expr!(cx, $index_ident .len()) - } - ) - } - _ => { - let field_type_ident = builder.id( - &::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty))); - - let field_type_ident_qualified = builder.id( - replace_qualified(&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)))); - - value_ident.and_then(|x| - { - Some(quote_expr!(cx, - match $field_type_ident_qualified::len_params() { - 0 => ::std::mem::size_of::<$field_type_ident>(), - _ => $x. $field_id .size(), - })) - }) - .unwrap_or_else(|| { - quote_expr!(cx, match $field_type_ident_qualified::len_params() { - 0 => ::std::mem::size_of::<$field_type_ident>(), - _ => $index_ident .size(), - }) - }) - } - } - }).collect(); - - let first_size_expr = size_exprs[0].clone(); - let mut total_size_expr = quote_expr!(cx, 0usize + $first_size_expr); - for index in 1..size_exprs.len() { - let next_expr = size_exprs[index].clone(); - total_size_expr = quote_expr!(cx, $total_size_expr + $next_expr); - } - - let mut write_stmts = Vec::::new(); - write_stmts.push(quote_stmt!(cx, let mut offset = 0usize;).expect("stmt1")); - - let mut map_stmts = Vec::::new(); - let field_amount = builder.id(&format!("{}",fields.len())); - map_stmts.push(quote_stmt!(cx, let mut map = vec![0usize; $field_amount];).expect("stmt2")); - map_stmts.push(quote_stmt!(cx, let mut total = 0usize;).expect("stmt3")); - - let mut post_write_stmts = Vec::::new(); - - for (index, field) in fields.iter().enumerate() { - let field_type_ident = builder.id( - &::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty))); - - let field_type_ident_qualified = builder.id( - replace_qualified(&::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)))); - - let field_id = match field.ident { - Some(ident) => builder.id(ident), - None => builder.id(format!("{}", index)), - }; - let member_expr = match value_ident { - Some(x) => { - quote_expr!(cx, $x . $field_id) - }, - None => { - let index_ident = builder.id(format!("__field{}", index)); - quote_expr!(cx, $index_ident) - }, - }; - - let raw_ident = ::syntax::print::pprust::ty_to_string(&codegen::strip_ptr(&field.ty)); - let range_ident = builder.id(format!("r{}", index)); - - let error_message = "Error serializing member: ".to_owned() + &::syntax::print::pprust::expr_to_string(&member_expr); - let _error_message_literal = builder.expr().lit().str::<&str>(&error_message); - - match raw_ident.as_ref() { - "u8" => { - write_stmts.push(quote_stmt!(cx, let next_line = offset + 1;).expect("stmt4")); - write_stmts.push(quote_stmt!(cx, buffer[offset] = $member_expr; ).expect("stm5")); - }, - "[u8]" => { - write_stmts.push(quote_stmt!(cx, let size = $member_expr .len();).unwrap()); - write_stmts.push(quote_stmt!(cx, let next_line = offset + size;).unwrap()); - write_stmts.push(quote_stmt!(cx, length_stack.push_back(size);).unwrap()); - write_stmts.push(quote_stmt!(cx, let $range_ident = offset..next_line; ).unwrap()); - post_write_stmts.push(quote_stmt!(cx, buffer[$range_ident].clone_from_slice($member_expr); ).unwrap()); - } - _ => { - write_stmts.push(quote_stmt!(cx, let next_line = offset + match $field_type_ident_qualified::len_params() { - 0 => ::std::mem::size_of::<$field_type_ident>(), - _ => { let size = $member_expr .size(); length_stack.push_back(size); size }, - }).unwrap()); - write_stmts.push(quote_stmt!(cx, let $range_ident = offset..next_line; ).unwrap()); - post_write_stmts.push(quote_stmt!(cx, - if $range_ident.end - $range_ident.start > 0 { - if let Err(e) = $member_expr .to_bytes(&mut buffer[$range_ident], length_stack) { - return Err(e) - }; - } - ).unwrap()); - } - } - - write_stmts.push(quote_stmt!(cx, offset = next_line; ).unwrap()); - - let field_index = builder.id(&format!("{}", index)); - map_stmts.push(quote_stmt!(cx, map[$field_index] = total;).unwrap()); - - match raw_ident.as_ref() { - "u8" => { - map_stmts.push(quote_stmt!(cx, total += 1;).unwrap()); - }, - "[u8]" => { - map_stmts.push(quote_stmt!(cx, let size = length_stack.pop_front().unwrap();).unwrap()); - map_stmts.push(quote_stmt!(cx, total += size;).unwrap()); - }, - _ => { - map_stmts.push(quote_stmt!(cx, let size = match $field_type_ident_qualified::len_params() { - 0 => ::std::mem::size_of::<$field_type_ident>(), - _ => length_stack.pop_front().unwrap(), - }).unwrap()); - map_stmts.push(quote_stmt!(cx, total += size;).unwrap()); - } - } - }; - - let read_expr = match fields.iter().any(|f| codegen::has_ptr(&f.ty)) { - true => { - // cannot create structs with pointers - quote_expr!(cx, Err(::ipc::binary::BinaryConvertError::not_supported())) - }, - false => { - if value_ident.is_some() { - let instance_create = named_fields_sequence(cx, &ty, fields); - quote_expr!(cx, { $map_stmts; $instance_create; Ok(result) }) - } - else { - let map_variant = P(fields_sequence(cx, &ty, fields, &instance_ident.unwrap_or(builder.id("Self")))); - quote_expr!(cx, { $map_stmts; Ok($map_variant) }) - } - }, - }; - - Ok(BinaryExpressions { - size: total_size_expr, - write: quote_expr!(cx, { $write_stmts; $post_write_stmts; Ok(()) } ), - read: read_expr, - }) -} - -#[allow(unreachable_code)] -fn binary_expr_item_struct( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - _impl_generics: &ast::Generics, - ty: P, - span: Span, - variant_data: &ast::VariantData, -) -> Result { - match *variant_data { - ast::VariantData::Tuple(ref fields, _) => { - binary_expr_struct( - cx, - &builder, - ty, - fields, - Some(builder.id("self")), - None, - ) - }, - ast::VariantData::Struct(ref fields, _) => { - binary_expr_struct( - cx, - &builder, - ty, - fields, - Some(builder.id("self")), - None, - ) - }, - _ => { - cx.span_bug(span, - &format!("#[derive(Binary)] Unsupported struct content, expected tuple/struct, found: {:?}", - variant_data)); - Err(Error) as Result - }, - } -} - -fn binary_expr_enum( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - type_ident: Ident, - impl_generics: &ast::Generics, - ty: P, - span: Span, - enum_def: &ast::EnumDef, -) -> Result { - let arms: Vec<_> = try!(enum_def.variants.iter() - .enumerate() - .map(|(variant_index, variant)| { - binary_expr_variant( - cx, - builder, - type_ident, - impl_generics, - ty.clone(), - span, - variant, - variant_index, - ) - }) - .collect()); - - let (size_arms, write_arms, mut read_arms) = ( - arms.iter().map(|x| x.size.clone()).collect::>(), - arms.iter().map(|x| x.write.clone()).collect::>(), - arms.iter().map(|x| x.read.clone()).collect::>()); - - read_arms.push(quote_arm!(cx, _ => { Err(::ipc::BinaryConvertError::variant(buffer[0])) } )); - - Ok(BinaryExpressions { - size: quote_expr!(cx, 1usize + match *self { $size_arms }), - write: quote_expr!(cx, match *self { $write_arms }; ), - read: quote_expr!(cx, match buffer[0] { $read_arms }), - }) -} - -struct BinaryArm { - size: ast::Arm, - write: ast::Arm, - read: ast::Arm, -} - -fn fields_sequence( - ext_cx: &ExtCtxt, - _ty: &P, - fields: &[ast::StructField], - variant_ident: &ast::Ident, -) -> ast::Expr { - use syntax::parse::token; - use syntax::tokenstream::TokenTree::Token; - - let named_members = fields.iter().any(|f| f.ident.is_some()); - - ::quasi::parse_expr_panic(&mut ::syntax::parse::new_parser_from_tts( - ext_cx.parse_sess(), - { - let _sp = ext_cx.call_site(); - let mut tt = ::std::vec::Vec::new(); - tt.push(Token(_sp, token::Ident(variant_ident.clone()))); - if named_members { - tt.push(Token(_sp, token::OpenDelim(token::Brace))); - } - else { - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - } - - for (idx, field) in fields.iter().enumerate() { - if field.ident.is_some() { - tt.push(Token(_sp, token::Ident(field.ident.clone().unwrap()))); - tt.push(Token(_sp, token::Colon)); - } - - // special case for u8, it just takes byte form sequence - if ::syntax::print::pprust::ty_to_string(&field.ty) == "u8" { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); - - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - - tt.push(Token(_sp, token::Comma)); - continue; - } - - // special case for [u8], it just takes a byte sequence - if ::syntax::print::pprust::ty_to_string(&field.ty) == "[u8]" { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); - - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - tt.push(Token(_sp, token::DotDot)); - - if idx+1 != fields.len() { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - } - - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - - tt.push(Token(_sp, token::Comma)); - continue; - } - - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push( - Token( - _sp, - token::Ident(ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty)))) - )); - tt.push(Token(_sp, token::ModSep)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - - tt.push(Token(_sp, token::BinOp(token::And))); - - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); - - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - tt.push(Token(_sp, token::DotDot)); - - if idx+1 != fields.len() { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - } - - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - - tt.push(Token(_sp, token::Comma)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack")))); - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - - // name member if it has resulted in the error - tt.push(Token(_sp, token::Dot)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map_err")))); - - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push(Token(_sp, token::BinOp(token::Or))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e")))); - tt.push(Token(_sp, token::BinOp(token::Or))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e")))); - tt.push(Token(_sp, token::Dot)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("named")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push(Token(_sp, token::Literal(token::Lit::Str_( - field.ident.unwrap_or(ext_cx.ident_of(&format!("f{}", idx))).name), - None)) - ); - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - - tt.push(Token(_sp, token::Comma)); - } - if named_members { - tt.push(Token(_sp, token::CloseDelim(token::Brace))); - } - else { - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - } - tt - }) - ).unwrap() -} - -fn named_fields_sequence( - ext_cx: &ExtCtxt, - ty: &P, - fields: &[ast::StructField], -) -> ast::Stmt { - use syntax::parse::token; - use syntax::tokenstream::TokenTree::Token; - - ::quasi::parse_stmt_panic(&mut ::syntax::parse::new_parser_from_tts( - ext_cx.parse_sess(), - { - let _sp = ext_cx.call_site(); - let mut tt = ::std::vec::Vec::new(); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("let")))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("result")))); - tt.push(Token(_sp, token::Eq)); - - tt.push(Token( - _sp, - token::Ident( - ext_cx.ident_of(&::syntax::print::pprust::ty_to_string(ty)) - ))); - - tt.push(Token(_sp, token::OpenDelim(token::Brace))); - - for (idx, field) in fields.iter().enumerate() { - tt.push(Token(_sp, match field.ident { - Some(ident) => token::Ident(ident), - None => token::Ident(ext_cx.ident_of(&format!("{}", idx))), - })); - tt.push(Token(_sp, token::Colon)); - - // special case for u8, it just takes byte form sequence - if ::syntax::print::pprust::ty_to_string(&field.ty) == "u8" { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); - - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - - tt.push(Token(_sp, token::Comma)); - continue; - } - - // special case for [u8], it just takes a byte sequence - if ::syntax::print::pprust::ty_to_string(&field.ty) == "[u8]" { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); - - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - tt.push(Token(_sp, token::DotDot)); - - if idx+1 != fields.len() { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - } - - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - - tt.push(Token(_sp, token::Comma)); - continue; - } - - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("try!")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push(Token( - _sp, - token::Ident( - ext_cx.ident_of(&replace_qualified(&::syntax::print::pprust::ty_to_string(&field.ty))) - ))); - tt.push(Token(_sp, token::ModSep)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("from_bytes")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - - tt.push(Token(_sp, token::BinOp(token::And))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("buffer")))); - - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - tt.push(Token(_sp, token::DotDot)); - if idx + 1 != fields.len() { - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map")))); - tt.push(Token(_sp, token::OpenDelim(token::Bracket))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of(&format!("{}", idx+1))))); - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - } - - tt.push(Token(_sp, token::CloseDelim(token::Bracket))); - - tt.push(Token(_sp, token::Comma)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("length_stack")))); - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - - // name member if it has resulted in the error - tt.push(Token(_sp, token::Dot)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("map_err")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push(Token(_sp, token::BinOp(token::Or))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e")))); - tt.push(Token(_sp, token::BinOp(token::Or))); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("e")))); - tt.push(Token(_sp, token::Dot)); - tt.push(Token(_sp, token::Ident(ext_cx.ident_of("named")))); - tt.push(Token(_sp, token::OpenDelim(token::Paren))); - tt.push(Token(_sp, token::Literal(token::Lit::Str_( - field.ident.unwrap_or(ext_cx.ident_of(&format!("f{}", idx))).name), - None)) - ); - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - - tt.push(Token(_sp, token::CloseDelim(token::Paren))); - tt.push(Token(_sp, token::Comma)); - } - - tt.push(Token(_sp, token::CloseDelim(token::Brace))); - tt - }) - ).unwrap() -} - -fn binary_expr_variant( - cx: &ExtCtxt, - builder: &aster::AstBuilder, - type_ident: Ident, - _generics: &ast::Generics, - ty: P, - _span: Span, - variant: &ast::Variant, - variant_index: usize, -) -> Result { - let variant_ident = variant.node.name; - let variant_index_ident = builder.id(format!("{}", variant_index)); - - match variant.node.data { - ast::VariantData::Unit(_) => { - let pat = builder.pat().path() - .id(type_ident).id(variant_ident) - .build(); - - let variant_val = builder.id(format!("{}::{}", type_ident, variant_ident)); - - Ok(BinaryArm { - size: quote_arm!(cx, $pat => { 0usize } ), - write: quote_arm!(cx, $pat => { buffer[0] = $variant_index_ident; Ok(()) } ), - read: quote_arm!(cx, $variant_index_ident => { Ok($variant_val) } ), - }) - }, - ast::VariantData::Tuple(ref fields, _) => { - let field_names: Vec = (0 .. fields.len()) - .map(|i| builder.id(format!("__field{}", i))) - .collect(); - - let pat = builder.pat().enum_() - .id(type_ident).id(variant_ident).build() - .with_pats( - field_names.iter() - .map(|field| builder.pat().ref_id(field)) - ) - .build(); - - let binary_expr = try!(binary_expr_struct( - cx, - &builder, - ty, - fields, - None, - Some(builder.id(format!("{}::{}", type_ident, variant_ident))), - )); - - let (size_expr, write_expr, read_expr) = (binary_expr.size, vec![binary_expr.write], binary_expr.read); - Ok(BinaryArm { - size: quote_arm!(cx, $pat => { $size_expr } ), - write: quote_arm!(cx, - $pat => { - buffer[0] = $variant_index_ident; - let buffer = &mut buffer[1..]; - $write_expr - }), - read: quote_arm!(cx, - $variant_index_ident => { - let buffer = &buffer[1..]; - $read_expr - } - ), - }) - }, - ast::VariantData::Struct(ref fields, _) => { - let field_names: Vec<_> = (0 .. fields.len()) - .map(|i| builder.id(format!("__field{}", i))) - .collect(); - - let pat = builder.pat().struct_() - .id(type_ident).id(variant_ident).build() - .with_pats( - field_names.iter() - .zip(fields.iter()) - .map(|(id, field)|(field.ident.unwrap(), builder.pat().ref_id(id)))) - .build(); - - let binary_expr = try!(binary_expr_struct( - cx, - &builder, - ty, - fields, - None, - Some(builder.id(format!("{}::{}", type_ident, variant_ident))), - )); - - let (size_expr, write_expr, read_expr) = (binary_expr.size, vec![binary_expr.write], binary_expr.read); - - Ok(BinaryArm { - size: quote_arm!(cx, $pat => { $size_expr } ), - write: quote_arm!(cx, - $pat => { - buffer[0] = $variant_index_ident; - let buffer = &mut buffer[1..]; - $write_expr - }), - read: quote_arm!(cx, - $variant_index_ident => { - let buffer = &buffer[1..]; - $read_expr - } - ), - }) - }, - } -} diff --git a/ipc/hypervisor/Cargo.toml b/ipc/hypervisor/Cargo.toml deleted file mode 100644 index 1db60c904e67a612ace957ec983eb36bfbfdcf4f..0000000000000000000000000000000000000000 --- a/ipc/hypervisor/Cargo.toml +++ /dev/null @@ -1,19 +0,0 @@ -[package] -name = "ethcore-ipc-hypervisor" -version = "1.2.0" -authors = ["Parity Technologies "] -license = "GPL-3.0" -build = "build.rs" - -[features] - -[dependencies] -ethcore-ipc = { path = "../rpc" } -nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" } -ethcore-ipc-nano = { path = "../nano" } -semver = "0.6" -log = "0.3" -time = "0.1" - -[build-dependencies] -ethcore-ipc-codegen = { path = "../codegen" } diff --git a/ipc/hypervisor/src/lib.rs b/ipc/hypervisor/src/lib.rs deleted file mode 100644 index b522122b5b87d1c379e9e8b57555564098569ac4..0000000000000000000000000000000000000000 --- a/ipc/hypervisor/src/lib.rs +++ /dev/null @@ -1,273 +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 . - -//! Parity interprocess hypervisor module - -#![cfg_attr(feature="dev", allow(used_underscore_binding))] - -extern crate ethcore_ipc as ipc; -extern crate ethcore_ipc_nano as nanoipc; -extern crate semver; -#[macro_use] extern crate log; -extern crate time; - -pub mod service; - -/// Default value for hypervisor ipc listener -pub const HYPERVISOR_IPC_URL: &'static str = "parity-internal-hyper-status.ipc"; - -use std::sync::{Arc,RwLock}; -use service::{HypervisorService, IpcModuleId}; -use std::process::{Command,Child}; -use std::collections::HashMap; - -pub use service::{HypervisorServiceClient, ControlService, CLIENT_MODULE_ID, SYNC_MODULE_ID}; - -pub type BinaryId = &'static str; - -pub struct Hypervisor { - ipc_addr: String, - service: Arc, - ipc_worker: RwLock>, - processes: RwLock>, - modules: HashMap, - pub io_path: String, -} - -/// Boot arguments for binary -pub struct BootArgs { - cli: Option>, - stdin: Option>, -} - -impl BootArgs { - /// New empty boot arguments - pub fn new() -> BootArgs { - BootArgs { - cli: None, - stdin: None, - } - } - - /// Set command-line arguments for boot - pub fn cli(mut self, cli: Vec) -> BootArgs { - self.cli = Some(cli); - self - } - - /// Set std-in stream for boot - pub fn stdin(mut self, stdin: Vec) -> BootArgs { - self.stdin = Some(stdin); - self - } -} - -impl Hypervisor { - /// initializes the Hypervisor service with the open ipc socket for incoming clients - pub fn new() -> Hypervisor { - Hypervisor::with_url(HYPERVISOR_IPC_URL) - } - - pub fn module(mut self, module_id: IpcModuleId, args: BootArgs) -> Hypervisor { - self.modules.insert(module_id, args); - self.service.add_module(module_id); - self - } - - pub fn local_module(self, module_id: IpcModuleId) -> Hypervisor { - self.service.add_module(module_id); - self - } - - pub fn io_path(mut self, directory: &str) -> Hypervisor { - self.io_path = directory.to_owned(); - self - } - - /// Starts with the specified address for the ipc listener and - /// the specified list of modules in form of created service - pub fn with_url(addr: &str) -> Hypervisor { - let service = HypervisorService::new(); - let worker = nanoipc::Worker::new(&service); - Hypervisor{ - ipc_addr: addr.to_owned(), - service: service, - ipc_worker: RwLock::new(worker), - processes: RwLock::new(HashMap::new()), - modules: HashMap::new(), - io_path: "/tmp".to_owned(), - } - } - - /// Since one binary can host multiple modules - /// we match binaries - fn match_module(&self, module_id: &IpcModuleId) -> Option<&BootArgs> { - self.modules.get(module_id) - } - - /// Creates IPC listener and starts all binaries - pub fn start(&self) { - let mut worker = self.ipc_worker.write().unwrap(); - worker.add_reqrep(&self.ipc_addr).unwrap_or_else(|e| panic!("Hypervisor ipc worker can not start - critical! ({:?})", e)); - - for module_id in self.service.module_ids() { - self.start_module(module_id); - } - } - - /// Start binary for the specified module - /// Does nothing when it is already started on module is inside the - /// main binary - fn start_module(&self, module_id: IpcModuleId) { - use std::io::Write; - - self.match_module(&module_id).map(|boot_args| { - let mut processes = self.processes.write().unwrap(); - { - if processes.get(&module_id).is_some() { - // already started for another module - return; - } - } - - let mut command = Command::new(&std::env::current_exe().unwrap()); - command.stderr(std::process::Stdio::inherit()); - - if let Some(ref cli_args) = boot_args.cli { - for arg in cli_args { command.arg(arg); } - } - - command.stdin(std::process::Stdio::piped()); - - trace!(target: "hypervisor", "Spawn executable: {:?}", command); - - let mut child = command.spawn().unwrap_or_else( - |e| panic!("Hypervisor cannot execute command ({:?}): {}", command, e)); - - if let Some(ref std_in) = boot_args.stdin { - trace!(target: "hypervisor", "Pushing std-in payload..."); - child.stdin.as_mut() - .expect("std-in should be piped above") - .write(std_in) - .unwrap_or_else(|e| panic!(format!("Error trying to pipe stdin for {:?}: {:?}", &command, e))); - drop(child.stdin.take()); - } - - processes.insert(module_id, child); - }); - } - - /// Reports if all modules are checked in - pub fn modules_ready(&self) -> bool { - self.service.unchecked_count() == 0 - } - - pub fn modules_shutdown(&self) -> bool { - self.service.running_count() == 0 - } - - /// Waits for every required module to check in - pub fn wait_for_startup(&self) { - let mut worker = self.ipc_worker.write().unwrap(); - while !self.modules_ready() { - worker.poll() - } - } - - /// Waits for every required module to check in - pub fn wait_for_shutdown(&self) -> bool { - use time::{PreciseTime, Duration}; - - let mut worker = self.ipc_worker.write().unwrap(); - let start = PreciseTime::now(); - while !self.modules_shutdown() { - worker.poll(); - if start.to(PreciseTime::now()) > Duration::seconds(30) { - warn!("Some modules failed to shutdown gracefully, they will be terminated."); - break; - } - } - self.modules_shutdown() - } - - /// Shutdown the ipc and all managed child processes - pub fn shutdown(&self) { - let mut childs = self.processes.write().unwrap(); - for (ref module, _) in childs.iter() { - trace!(target: "hypervisor", "Stopping process module: {}", module); - self.service.send_shutdown(**module); - } - trace!(target: "hypervisor", "Waiting for shutdown..."); - if self.wait_for_shutdown() { - trace!(target: "hypervisor", "All modules reported shutdown"); - return; - } - - for (ref module, ref mut process) in childs.iter_mut() { - if self.service.is_running(**module) { - process.kill().unwrap(); - trace!("Terminated {}", module); - } - } - } -} - -impl Drop for Hypervisor { - fn drop(&mut self) { - self.shutdown(); - } -} - -#[cfg(test)] -mod tests { - use super::*; - use std::sync::atomic::{AtomicBool,Ordering}; - use std::sync::Arc; - use nanoipc; - - #[test] - fn can_init() { - let url = "ipc:///tmp/test-parity-hypervisor-10.ipc"; - let test_module_id = 8080u64; - - let hypervisor = Hypervisor::with_url(url).local_module(test_module_id); - assert_eq!(false, hypervisor.modules_ready()); - } - - #[test] - fn can_wait_for_startup() { - let url = "ipc:///tmp/test-parity-hypervisor-20.ipc"; - let test_module_id = 8080u64; - - let hypervisor_ready = Arc::new(AtomicBool::new(false)); - let hypervisor_ready_local = hypervisor_ready.clone(); - - ::std::thread::spawn(move || { - while !hypervisor_ready.load(Ordering::Relaxed) { } - - let client = nanoipc::fast_client::>(url).unwrap(); - client.handshake().unwrap(); - client.module_ready(test_module_id, url.to_owned()); - }); - - let hypervisor = Hypervisor::with_url(url).local_module(test_module_id); - hypervisor.start(); - hypervisor_ready_local.store(true, Ordering::Relaxed); - hypervisor.wait_for_startup(); - - assert_eq!(true, hypervisor.modules_ready()); - } -} diff --git a/ipc/hypervisor/src/service.rs b/ipc/hypervisor/src/service.rs deleted file mode 100644 index 59040251e6452018c4a99454e842c54cb26a969f..0000000000000000000000000000000000000000 --- a/ipc/hypervisor/src/service.rs +++ /dev/null @@ -1,20 +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 . - -//! Parity interprocess hypervisor IPC service -#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues - -include!(concat!(env!("OUT_DIR"), "/service.rs.in")); diff --git a/ipc/hypervisor/src/service.rs.in b/ipc/hypervisor/src/service.rs.in deleted file mode 100644 index 6d6f382680cd6632060d3a0d6f4783b3099141bb..0000000000000000000000000000000000000000 --- a/ipc/hypervisor/src/service.rs.in +++ /dev/null @@ -1,125 +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 . - -use std::sync::{RwLock,Arc}; -use ipc::IpcConfig; -use std::collections::HashMap; -use nanoipc; - -pub type IpcModuleId = u64; - -/// Blockhain database module id -pub const CLIENT_MODULE_ID: IpcModuleId = 2000; - -/// Sync module id -pub const SYNC_MODULE_ID: IpcModuleId = 2100; - -/// IPC service that handles module management -pub struct HypervisorService { - modules: RwLock>, -} - -#[derive(Default)] -pub struct ModuleState { - started: bool, - control_url: String, - shutdown: bool, -} - -#[ipc] -pub trait ControlService { - fn shutdown(&self) -> bool; -} - -#[ipc] -impl HypervisorService { - // return type for making method synchronous - fn module_ready(&self, module_id: u64, control_url: String) -> bool { - let mut modules = self.modules.write().unwrap(); - modules.get_mut(&module_id).map(|mut module| { - module.started = true; - module.control_url = control_url; - }); - trace!(target: "hypervisor", "Module ready: {}", module_id); - true - } - - // return type for making method synchronous - fn module_shutdown(&self, module_id: u64) -> bool { - let mut modules = self.modules.write().unwrap(); - modules.get_mut(&module_id).map(|mut module| { - module.shutdown = true; - }); - trace!(target: "hypervisor", "Module shutdown: {}", module_id); - true - } -} - -impl HypervisorService { - /// New service with the default list of modules - pub fn new() -> Arc { - HypervisorService::with_modules(vec![]) - } - - /// New service with list of modules that will report for being ready - pub fn with_modules(module_ids: Vec) -> Arc { - let mut modules = HashMap::new(); - for module_id in module_ids { - modules.insert(module_id, ModuleState::default()); - } - Arc::new(HypervisorService { - modules: RwLock::new(modules), - }) - } - - /// Add the module to the check-list - pub fn add_module(&self, module_id: IpcModuleId) { - self.modules.write().unwrap().insert(module_id, ModuleState::default()); - } - - /// Number of modules still being waited for check-in - pub fn unchecked_count(&self) -> usize { - self.modules.read().unwrap().iter().filter(|&(_, module)| !module.started).count() - } - - /// List of all modules within this service - pub fn module_ids(&self) -> Vec { - self.modules.read().unwrap().iter().map(|(module_id, _)| module_id).cloned().collect() - } - - /// Number of modules started and running - pub fn running_count(&self) -> usize { - self.modules.read().unwrap().iter().filter(|&(_, module)| module.started && !module.shutdown).count() - } - - pub fn is_running(&self, id: IpcModuleId) -> bool { - self.modules.read().unwrap().get(&id).map(|module| module.started && !module.shutdown).unwrap_or(false) - } - - pub fn send_shutdown(&self, module_id: IpcModuleId) { - let modules = self.modules.read().unwrap(); - modules.get(&module_id).map(|module| { - trace!(target: "hypervisor", "Sending shutdown to {}({})", module_id, &module.control_url); - let client = nanoipc::fast_client::>(&module.control_url).unwrap(); - client.shutdown(); - trace!(target: "hypervisor", "Sent shutdown to {}", module_id); - }); - } -} - -impl ::ipc::IpcConfig for HypervisorService {} - -impl ::ipc::IpcConfig for ControlService {} diff --git a/ipc/nano/Cargo.toml b/ipc/nano/Cargo.toml deleted file mode 100644 index bb6fbb0b26c639971738de6eba8e89c080955b04..0000000000000000000000000000000000000000 --- a/ipc/nano/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "ethcore-ipc-nano" -version = "1.9.0" -authors = ["Parity Technologies "] -license = "GPL-3.0" - -[features] - -[dependencies] -ethcore-ipc = { path = "../rpc" } -nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" } -log = "0.3" -lazy_static = "0.2" diff --git a/ipc/nano/src/lib.rs b/ipc/nano/src/lib.rs deleted file mode 100644 index 9be3d2b1d26a3fd660eb0613d4747f0ea5c198a9..0000000000000000000000000000000000000000 --- a/ipc/nano/src/lib.rs +++ /dev/null @@ -1,355 +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 . - -//! IPC over nanomsg transport - -extern crate ethcore_ipc as ipc; -extern crate nanomsg; -#[macro_use] extern crate log; -#[macro_use] extern crate lazy_static; - -pub use ipc::{WithSocket, IpcInterface, IpcConfig}; -pub use nanomsg::Socket as NanoSocket; - -use std::sync::*; -use nanomsg::{Socket, Protocol, Error, Endpoint, PollRequest, PollFd, PollInOut}; -use std::ops::Deref; - -const POLL_TIMEOUT: isize = 200; -const DEFAULT_CONNECTION_TIMEOUT: isize = 30000; -const DEBUG_CONNECTION_TIMEOUT: isize = 5000; - -/// Generic worker to handle service (binded) sockets -pub struct Worker where S: IpcInterface { - service: Arc, - sockets: Vec<(Socket, Endpoint)>, - polls: Vec, - buf: Vec, -} - -/// struct for guarding `_endpoint` (so that it wont drop) -/// derefs to client `S` -pub struct GuardedSocket where S: WithSocket { - client: Arc, - _endpoint: Endpoint, -} - -impl GuardedSocket where S: WithSocket { - pub fn service(&self) -> Arc { - self.client.clone() - } -} - -impl Deref for GuardedSocket where S: WithSocket { - type Target = Arc; - - fn deref(&self) -> &Arc { - &self.client - } -} - -/// Spawns client <`S`> over specified address -/// creates socket and connects endpoint to it -/// for duplex (paired) connections with the service -pub fn init_duplex_client(socket_addr: &str) -> Result, SocketError> where S: WithSocket { - let mut socket = Socket::new(Protocol::Pair).map_err(|e| { - warn!(target: "ipc", "Failed to create ipc socket: {:?}", e); - SocketError::DuplexLink - })?; - - socket.set_receive_timeout(DEFAULT_CONNECTION_TIMEOUT).unwrap(); - - let endpoint = socket.connect(socket_addr).map_err(|e| { - warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", socket_addr, e); - SocketError::DuplexLink - })?; - - Ok(GuardedSocket { - client: Arc::new(S::init(socket)), - _endpoint: endpoint, - }) -} - -/// Spawns client <`S`> over specified address -/// creates socket and connects endpoint to it -/// for request-reply connections to the service -pub fn client(socket_addr: &str, receive_timeout: Option) -> Result, SocketError> where S: WithSocket { - let mut socket = Socket::new(Protocol::Req).map_err(|e| { - warn!(target: "ipc", "Failed to create ipc socket: {:?}", e); - SocketError::RequestLink - })?; - - if let Some(timeout) = receive_timeout { - socket.set_receive_timeout(timeout).unwrap(); - } - - let endpoint = socket.connect(socket_addr).map_err(|e| { - warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", socket_addr, e); - SocketError::RequestLink - })?; - - trace!(target: "ipc", "Created client for {}", socket_addr); - Ok(GuardedSocket { - client: Arc::new(S::init(socket)), - _endpoint: endpoint, - }) -} - -lazy_static! { - /// Set PARITY_IPC_DEBUG=1 for fail-fast connectivity problems diagnostic - pub static ref DEBUG_FLAG: bool = { - use std::env; - - if let Ok(debug) = env::var("PARITY_IPC_DEBUG") { - debug == "1" || debug.to_uppercase() == "TRUE" - } - else { false } - }; -} - -/// Client with no default timeout on operations -pub fn generic_client(socket_addr: &str) -> Result, SocketError> where S: WithSocket { - if *DEBUG_FLAG { - client(socket_addr, Some(DEBUG_CONNECTION_TIMEOUT)) - } else { - client(socket_addr, None) - } -} - -/// Client over interface that is supposed to give quick almost non-blocking responses -pub fn fast_client(socket_addr: &str) -> Result, SocketError> where S: WithSocket { - if *DEBUG_FLAG { - client(socket_addr, Some(DEBUG_CONNECTION_TIMEOUT)) - } else { - client(socket_addr, Some(DEFAULT_CONNECTION_TIMEOUT)) - } -} - -/// Error occurred while establising socket or endpoint -#[derive(Debug)] -pub enum SocketError { - /// Error establising duplex (paired) socket and/or endpoint - DuplexLink, - /// Error establising duplex (paired) socket and/or endpoint - RequestLink, -} - -impl Worker where S: IpcInterface { - /// New worker over specified `service` - pub fn new(service: &Arc) -> Worker { - Worker:: { - service: service.clone(), - sockets: Vec::new(), - polls: Vec::new(), - buf: Vec::new(), - } - } - - /// Polls all sockets, reads and dispatches method invocations - pub fn poll(&mut self) { - use std::io::Write; - - let mut request = PollRequest::new(&mut self.polls[..]); - let _result_guard = Socket::poll(&mut request, POLL_TIMEOUT); - - for (fd_index, fd) in request.get_fds().iter().enumerate() { - if fd.can_read() { - let (ref mut socket, _) = self.sockets[fd_index]; - unsafe { self.buf.set_len(0); } - match socket.nb_read_to_end(&mut self.buf) { - Ok(method_sign_len) => { - if method_sign_len >= 2 { - - // method_num - let method_num = self.buf[0] as u16 * 256 + self.buf[1] as u16; - // payload - let payload = &self.buf[2..]; - - // dispatching for ipc interface - let result = self.service.dispatch_buf(method_num, payload); - - if let Err(e) = socket.write(&result) { - warn!(target: "ipc", "Failed to write response: {:?}", e); - } - } - else { - warn!(target: "ipc", "Failed to read method signature from socket: unexpected message length({})", method_sign_len); - } - }, - Err(Error::TryAgain) => { - }, - Err(x) => { - warn!(target: "ipc", "Error polling connections {:?}", x); - panic!(); - } - } - } - } - } - - /// Stores nanomsg poll request for reuse - fn rebuild_poll_request(&mut self) { - self.polls = self.sockets.iter() - .map(|&(ref socket, _)| socket.new_pollfd(PollInOut::In)) - .collect::>(); - } - - /// Add exclusive socket for paired client - /// Only one connection over this address is allowed - pub fn add_duplex(&mut self, addr: &str) -> Result<(), SocketError> { - let mut socket = Socket::new(Protocol::Pair).map_err(|e| { - warn!(target: "ipc", "Failed to create ipc socket: {:?}", e); - SocketError::DuplexLink - })?; - - let endpoint = socket.bind(addr).map_err(|e| { - warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", addr, e); - SocketError::DuplexLink - })?; - - self.sockets.push((socket, endpoint)); - - self.rebuild_poll_request(); - - trace!(target: "ipc", "Started duplex worker at {}", addr); - - Ok(()) - } - - /// Add generic socket for request-reply style communications - /// with multiple clients - pub fn add_reqrep(&mut self, addr: &str) -> Result<(), SocketError> { - let mut socket = Socket::new(Protocol::Rep).map_err(|e| { - warn!(target: "ipc", "Failed to create ipc socket: {:?}", e); - SocketError::DuplexLink - })?; - - - let endpoint = socket.bind(addr).map_err(|e| { - warn!(target: "ipc", "Failed to bind socket to address '{}': {:?}", addr, e); - SocketError::DuplexLink - })?; - - self.sockets.push((socket, endpoint)); - - self.rebuild_poll_request(); - - trace!(target: "ipc", "Started request-reply worker at {}", addr); - Ok(()) - } -} - -#[cfg(test)] -mod service_tests { - - use super::Worker; - use ipc::*; - use std::io::{Read, Write}; - use std::sync::{Arc, RwLock}; - use nanomsg::{Socket, Protocol, Endpoint}; - - struct TestInvoke { - method_num: u16, - params: Vec, - } - - struct DummyService { - methods_stack: RwLock>, - } - - impl DummyService { - fn new() -> DummyService { - DummyService { methods_stack: RwLock::new(Vec::new()) } - } - } - - impl IpcInterface for DummyService { - fn dispatch(&self, _r: &mut R) -> Vec where R: Read { - vec![] - } - fn dispatch_buf(&self, method_num: u16, buf: &[u8]) -> Vec { - self.methods_stack.write().unwrap().push( - TestInvoke { - method_num: method_num, - params: buf.to_vec(), - }); - vec![] - } - } - - impl IpcConfig for DummyService {} - - fn dummy_write(addr: &str, buf: &[u8]) -> (Socket, Endpoint) { - let mut socket = Socket::new(Protocol::Pair).unwrap(); - let endpoint = socket.connect(addr).unwrap(); - socket.write(buf).unwrap(); - (socket, endpoint) - } - - #[test] - fn can_create_worker() { - let worker = Worker::::new(&Arc::new(DummyService::new())); - assert_eq!(0, worker.sockets.len()); - } - - #[test] - fn can_add_duplex_socket_to_worker() { - let mut worker = Worker::::new(&Arc::new(DummyService::new())); - worker.add_duplex("ipc:///tmp/parity-test10.ipc").unwrap(); - assert_eq!(1, worker.sockets.len()); - } - - #[test] - fn worker_can_poll_empty() { - let service = Arc::new(DummyService::new()); - let mut worker = Worker::::new(&service); - worker.add_duplex("ipc:///tmp/parity-test20.ipc").unwrap(); - worker.poll(); - assert_eq!(0, service.methods_stack.read().unwrap().len()); - } - - #[test] - fn worker_can_poll() { - let url = "ipc:///tmp/parity-test30.ipc"; - - let mut worker = Worker::::new(&Arc::new(DummyService::new())); - worker.add_duplex(url).unwrap(); - - let (_socket, _endpoint) = dummy_write(url, &vec![0, 0, 7, 7, 6, 6]); - worker.poll(); - - assert_eq!(1, worker.service.methods_stack.read().unwrap().len()); - assert_eq!(0, worker.service.methods_stack.read().unwrap()[0].method_num); - assert_eq!([7, 7, 6, 6], worker.service.methods_stack.read().unwrap()[0].params[..]); - } - - #[test] - fn worker_can_poll_long() { - let url = "ipc:///tmp/parity-test40.ipc"; - - let mut worker = Worker::::new(&Arc::new(DummyService::new())); - worker.add_duplex(url).unwrap(); - - let message = [0u8; 1024*1024]; - - let (_socket, _endpoint) = dummy_write(url, &message); - worker.poll(); - - assert_eq!(1, worker.service.methods_stack.read().unwrap().len()); - assert_eq!(0, worker.service.methods_stack.read().unwrap()[0].method_num); - assert_eq!(vec![0u8; 1024*1024-2], worker.service.methods_stack.read().unwrap()[0].params); - } -} diff --git a/ipc/rpc/Cargo.toml b/ipc/rpc/Cargo.toml deleted file mode 100644 index bd33ab618ab6c628f4d12707bf0101e62e8513c0..0000000000000000000000000000000000000000 --- a/ipc/rpc/Cargo.toml +++ /dev/null @@ -1,14 +0,0 @@ -[package] -name = "ethcore-ipc" -version = "1.9.0" -authors = ["Parity Technologies "] -license = "GPL-3.0" - -[features] - -[dependencies] -ethcore-devtools = { path = "../../devtools" } -nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" } -ethcore-bigint = { path = "../../util/bigint"} -ethcore-util = { path = "../../util" } -semver = "0.6" diff --git a/ipc/rpc/src/binary.rs b/ipc/rpc/src/binary.rs deleted file mode 100644 index 6466acdb1394e261eeafa890cd982ea75572fb43..0000000000000000000000000000000000000000 --- a/ipc/rpc/src/binary.rs +++ /dev/null @@ -1,1196 +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 . - -//! Binary representation of types - -use bigint::prelude::{U256, U512}; -use bigint::hash::{H256, H512, H2048}; -use util::{Address}; -use std::mem; -use std::collections::{VecDeque, BTreeMap}; -use std::ops::Range; -use super::Handshake; - -#[derive(Debug)] -pub enum BinaryConvertErrorKind { - SizeMismatch { - expected: usize, - found: usize, - }, - TargetPayloadEmpty, - UnexpectedVariant(u8), - MissingLengthValue, - InconsistentBoundaries, - NotSupported, -} - -#[derive(Debug)] -pub struct BinaryConvertError { - member_tree: Vec<&'static str>, - kind: BinaryConvertErrorKind, -} - -impl BinaryConvertError { - pub fn size(expected: usize, found: usize) -> BinaryConvertError { - BinaryConvertError { - member_tree: Vec::new(), - kind: BinaryConvertErrorKind::SizeMismatch { - expected: expected, - found: found, - } - } - } - - pub fn empty() -> BinaryConvertError { - BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::TargetPayloadEmpty } - } - - pub fn variant(val: u8) -> BinaryConvertError { - BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::UnexpectedVariant(val) } - } - - pub fn length() -> BinaryConvertError { - BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::MissingLengthValue } - } - - pub fn boundaries() -> BinaryConvertError { - BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::InconsistentBoundaries } - } - - pub fn not_supported() -> BinaryConvertError { - BinaryConvertError { member_tree: Vec::new(), kind: BinaryConvertErrorKind::NotSupported } - } - - pub fn named(mut self, name: &'static str) -> BinaryConvertError { - self.member_tree.push(name); - self - } -} - -#[derive(Debug)] -pub enum BinaryError { - Serialization(BinaryConvertError), - Io(::std::io::Error), -} - -impl From<::std::io::Error> for BinaryError { - fn from(err: ::std::io::Error) -> Self { BinaryError::Io(err) } -} - -impl From for BinaryError { - fn from(err: BinaryConvertError) -> Self { BinaryError::Serialization(err) } -} - -pub trait BinaryConvertable : Sized { - fn size(&self) -> usize { - mem::size_of::() - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError>; - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result; - - fn from_empty_bytes() -> Result { - Err(BinaryConvertError::size(mem::size_of::(), 0)) - } - - fn len_params() -> usize { - 0 - } -} - -impl BinaryConvertable for Option where T: BinaryConvertable { - fn size(&self) -> usize { - match * self { None => 0, Some(ref val) => val.size() } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - match *self { None => Err(BinaryConvertError::empty()), Some(ref val) => val.to_bytes(buffer, length_stack) } - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - if buffer.len() == 0 { return Self::from_empty_bytes(); } - Ok(Some(T::from_bytes(buffer, length_stack)?)) - } - - fn from_empty_bytes() -> Result { - Ok(None) - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for Result<(), E> { - fn size(&self) -> usize { - match *self { - Ok(_) => 0, - Err(ref e) => e.size(), - } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - match *self { - Ok(_) => Err(BinaryConvertError::empty()), - Err(ref e) => Ok(e.to_bytes(buffer, length_stack)?), - } - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - Ok(Err(E::from_bytes(&buffer, length_stack)?)) - } - - fn from_empty_bytes() -> Result { - Ok(Ok(())) - } - - fn len_params() -> usize { - 1 - } -} - - -impl BinaryConvertable for Result { - fn size(&self) -> usize { - match *self { - Ok(ref r) => r.size(), - Err(_) => 0, - } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - match *self { - Ok(ref r) => Ok(r.to_bytes(buffer, length_stack)?), - Err(_) => Err(BinaryConvertError::empty()), - } - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - Ok(Ok(R::from_bytes(&buffer, length_stack)?)) - } - - fn from_empty_bytes() -> Result { - Ok(Err(())) - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for Result { - fn size(&self) -> usize { - 1usize + match *self { - Ok(ref r) => r.size(), - Err(ref e) => e.size(), - } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - match *self { - Ok(ref r) => { - buffer[0] = 0; - if r.size() > 0 { - Ok(r.to_bytes(&mut buffer[1..], length_stack)?) - } - else { Ok(()) } - }, - Err(ref e) => { - buffer[0] = 1; - if e.size() > 0 { - Ok(e.to_bytes(&mut buffer[1..], length_stack)?) - } - else { Ok(()) } - }, - } - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - match buffer[0] { - 0 => { - match buffer.len() { - 1 => Ok(Ok(R::from_empty_bytes()?)), - _ => Ok(Ok(R::from_bytes(&buffer[1..], length_stack)?)), - } - } - 1 => Ok(Err(E::from_bytes(&buffer[1..], length_stack)?)), - _ => Err(BinaryConvertError::variant(buffer[0])) - } - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for BTreeMap where K : BinaryConvertable + Ord, V: BinaryConvertable { - fn size(&self) -> usize { - 0usize + match K::len_params() { - 0 => mem::size_of::() * self.len(), - _ => self.iter().fold(0usize, |acc, (k, _)| acc + k.size()) - } + match V::len_params() { - 0 => mem::size_of::() * self.len(), - _ => self.iter().fold(0usize, |acc, (_, v)| acc + v.size()) - } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - let mut offset = 0usize; - for (key, val) in self.iter() { - let key_size = match K::len_params() { - 0 => mem::size_of::(), - _ => { let size = key.size(); length_stack.push_back(size); size } - }; - let val_size = match K::len_params() { - 0 => mem::size_of::(), - _ => { let size = val.size(); length_stack.push_back(size); size } - }; - - if key_size > 0 { - let item_end = offset + key_size; - key.to_bytes(&mut buffer[offset..item_end], length_stack)?; - offset = item_end; - } - - if val_size > 0 { - let item_end = offset + key_size; - val.to_bytes(&mut buffer[offset..item_end], length_stack)?; - offset = item_end; - } - } - Ok(()) - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - let mut index = 0; - let mut result = Self::new(); - - if buffer.len() == 0 { return Ok(result); } - - loop { - let key_size = match K::len_params() { - 0 => mem::size_of::(), - _ => length_stack.pop_front().ok_or(BinaryConvertError::length())?, - }; - let key = if key_size == 0 { - K::from_empty_bytes()? - } else { - if index + key_size > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - K::from_bytes(&buffer[index..index+key_size], length_stack)? - }; - index = index + key_size; - - let val_size = match V::len_params() { - 0 => mem::size_of::(), - _ => length_stack.pop_front().ok_or(BinaryConvertError::length())?, - }; - let val = if val_size == 0 { - V::from_empty_bytes()? - } else { - if index + val_size > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - V::from_bytes(&buffer[index..index+val_size], length_stack)? - }; - result.insert(key, val); - index = index + val_size; - - if index == buffer.len() { break; } - if index > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - } - - Ok(result) - } - - fn from_empty_bytes() -> Result { - Ok(Self::new()) - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for VecDeque where T: BinaryConvertable { - fn size(&self) -> usize { - match T::len_params() { - 0 => mem::size_of::() * self.len(), - _ => self.iter().fold(0usize, |acc, t| acc + t.size()), - } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - let mut offset = 0usize; - for item in self.iter() { - let next_size = match T::len_params() { - 0 => mem::size_of::(), - _ => { let size = item.size(); length_stack.push_back(size); size }, - }; - if next_size > 0 { - let item_end = offset + next_size; - item.to_bytes(&mut buffer[offset..item_end], length_stack)?; - offset = item_end; - } - } - Ok(()) - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - let mut index = 0; - let mut result = Self::with_capacity( - match T::len_params() { - 0 => buffer.len() / mem::size_of::(), - _ => 128, - }); - - if buffer.len() == 0 { return Ok(result); } - - loop { - let next_size = match T::len_params() { - 0 => mem::size_of::(), - _ => length_stack.pop_front().ok_or(BinaryConvertError::length())?, - }; - let item = if next_size == 0 { - T::from_empty_bytes()? - } - else { - if index + next_size > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - T::from_bytes(&buffer[index..index+next_size], length_stack)? - }; - result.push_back(item); - - index = index + next_size; - if index == buffer.len() { break; } - if index > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - } - - Ok(result) - } - - fn from_empty_bytes() -> Result { - Ok(Self::new()) - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for Vec where T: BinaryConvertable { - fn size(&self) -> usize { - match T::len_params() { - 0 => mem::size_of::() * self.len(), - _ => self.iter().fold(0usize, |acc, t| acc + t.size()), - } - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - let mut offset = 0usize; - for item in self.iter() { - let next_size = match T::len_params() { - 0 => mem::size_of::(), - _ => { let size = item.size(); length_stack.push_back(size); size }, - }; - if next_size > 0 { - let item_end = offset + next_size; - item.to_bytes(&mut buffer[offset..item_end], length_stack)?; - offset = item_end; - } - } - Ok(()) - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - let mut index = 0; - let mut result = Self::with_capacity( - match T::len_params() { - 0 => buffer.len() / mem::size_of::(), - _ => 128, - }); - - if buffer.len() == 0 { return Ok(result); } - - loop { - let next_size = match T::len_params() { - 0 => mem::size_of::(), - _ => length_stack.pop_front().ok_or(BinaryConvertError::length())?, - }; - let item = if next_size == 0 { - T::from_empty_bytes()? - } - else { - if index + next_size > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - T::from_bytes(&buffer[index..index+next_size], length_stack)? - }; - result.push(item); - - index = index + next_size; - if index == buffer.len() { break; } - if index > buffer.len() { - return Err(BinaryConvertError::boundaries()) - } - } - - Ok(result) - } - - fn from_empty_bytes() -> Result { - Ok(Self::new()) - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for String { - fn size(&self) -> usize { - self.as_bytes().len() - } - - fn from_empty_bytes() -> Result { - Ok(String::new()) - } - - fn to_bytes(&self, buffer: &mut [u8], _length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - buffer[..].clone_from_slice(self.as_bytes()); - Ok(()) - } - - fn from_bytes(buffer: &[u8], _length_stack: &mut VecDeque) -> Result { - Ok(::std::str::from_utf8(buffer).unwrap().to_owned()) - } - - fn len_params() -> usize { - 1 - } -} - -impl BinaryConvertable for Range where T: BinaryConvertable { - fn size(&self) -> usize { - mem::size_of::() * 2 - } - - fn from_empty_bytes() -> Result { - Err(BinaryConvertError::empty()) - } - - fn to_bytes(&self, buffer: &mut[u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - self.start.to_bytes(&mut buffer[..mem::size_of::()], length_stack)?; - self.end.to_bytes(&mut buffer[mem::size_of::() + 1..], length_stack)?; - Ok(()) - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - Ok(T::from_bytes(&buffer[..mem::size_of::()], length_stack)?..T::from_bytes(&buffer[mem::size_of::()+1..], length_stack)?) - } - - fn len_params() -> usize { - assert_eq!(0, T::len_params()); - 0 - } -} - -impl BinaryConvertable for ::std::cell::RefCell where T: BinaryConvertable { - fn size(&self) -> usize { - self.borrow().size() - } - - fn from_empty_bytes() -> Result { - Ok(::std::cell::RefCell::new(T::from_empty_bytes()?)) - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - Ok(::std::cell::RefCell::new(T::from_bytes(buffer, length_stack)?)) - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - self.borrow().to_bytes(buffer, length_stack)?; - Ok(()) - } - - fn len_params() -> usize { - T::len_params() - } -} - -impl BinaryConvertable for ::std::cell::Cell where T: BinaryConvertable + Copy { - fn size(&self) -> usize { - self.get().size() - } - - fn from_empty_bytes() -> Result { - Ok(::std::cell::Cell::new(T::from_empty_bytes()?)) - } - - fn from_bytes(buffer: &[u8], length_stack: &mut VecDeque) -> Result { - Ok(::std::cell::Cell::new(T::from_bytes(buffer, length_stack)?)) - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - self.get().to_bytes(buffer, length_stack)?; - Ok(()) - } - - fn len_params() -> usize { - T::len_params() - } -} - -impl BinaryConvertable for Vec { - fn size(&self) -> usize { - self.len() - } - - fn from_empty_bytes() -> Result { - Ok(Vec::new()) - } - - fn to_bytes(&self, buffer: &mut [u8], _length_stack: &mut VecDeque) -> Result<(), BinaryConvertError> { - buffer[..].clone_from_slice(&self[..]); - Ok(()) - } - - fn from_bytes(buffer: &[u8], _length_stack: &mut VecDeque) -> Result { - let mut res = Self::with_capacity(buffer.len()); - unsafe { res.set_len(buffer.len()) } - res[..].clone_from_slice(&buffer[..]); - Ok(res) - } - - fn len_params() -> usize { - 1 - } -} - -pub fn deserialize_from(r: &mut R) -> Result - where R: ::std::io::Read, - T: BinaryConvertable -{ - let mut fake_stack = VecDeque::new(); - - match T::len_params() { - 0 => { - let fixed_size = mem::size_of::(); - let mut payload_buffer = Vec::with_capacity(fixed_size); - unsafe { payload_buffer.set_len(fixed_size); } - let bytes_read = r.read(&mut payload_buffer)?; - if bytes_read != mem::size_of::() { - return Err(BinaryError::Serialization(BinaryConvertError::size(fixed_size, bytes_read))) - } - Ok(T::from_bytes(&payload_buffer[..], &mut fake_stack)?) - }, - _ => { - let mut payload = Vec::new(); - r.read_to_end(&mut payload)?; - - let stack_len = u64::from_bytes(&payload[0..8], &mut fake_stack)? as usize; - let mut length_stack = VecDeque::::with_capacity(stack_len); - - if stack_len > 0 { - for idx in 0..stack_len { - let stack_item = u64::from_bytes(&payload[8 + idx*8..8 + (idx+1)*8], &mut fake_stack)?; - length_stack.push_back(stack_item as usize); - } - } - - let size = u64::from_bytes(&payload[8+stack_len*8..16+stack_len*8], &mut fake_stack)? as usize; - match size { - 0 => { - Ok(T::from_empty_bytes()?) - }, - _ => { - Ok(T::from_bytes(&payload[16+stack_len*8..], &mut length_stack)?) - } - } - }, - } -} - -pub fn deserialize(buffer: &[u8]) -> Result { - use std::io::Cursor; - let mut buff = Cursor::new(buffer); - deserialize_from::(&mut buff) -} - -pub fn serialize_into(t: &T, w: &mut W) -> Result<(), BinaryError> - where W: ::std::io::Write, - T: BinaryConvertable -{ - let mut fake_stack = VecDeque::new(); - - match T::len_params() { - 0 => { - let fixed_size = mem::size_of::(); - let mut buffer = Vec::with_capacity(fixed_size); - unsafe { buffer.set_len(fixed_size); } - t.to_bytes(&mut buffer[..], &mut fake_stack)?; - w.write(&buffer[..])?; - Ok(()) - }, - _ => { - let mut length_stack = VecDeque::::new(); - let mut size_buffer = [0u8; 8]; - - let size = t.size(); - if size == 0 { - w.write(&size_buffer)?; - w.write(&size_buffer)?; - return Ok(()); - } - - let mut buffer = Vec::with_capacity(size); - unsafe { buffer.set_len(size); } - t.to_bytes(&mut buffer[..], &mut length_stack)?; - - let stack_len = length_stack.len(); - (stack_len as u64).to_bytes(&mut size_buffer[..], &mut fake_stack)?; - w.write(&size_buffer[..])?; - if stack_len > 0 { - let mut header_buffer = Vec::with_capacity(stack_len * 8); - unsafe { header_buffer.set_len(stack_len * 8); }; - (stack_len as u64).to_bytes(&mut header_buffer[0..8], &mut fake_stack)?; - let mut idx = 0; - loop { - match length_stack.pop_front() { - Some(val) => (val as u64).to_bytes(&mut header_buffer[idx * 8..(idx+1) * 8], &mut fake_stack)?, - None => { break; } - } - idx = idx + 1; - } - w.write(&header_buffer[..])?; - } - - (size as u64).to_bytes(&mut size_buffer[..], &mut fake_stack)?; - w.write(&size_buffer[..])?; - - w.write(&buffer[..])?; - - Ok(()) - }, - } -} - -pub fn serialize(t: &T) -> Result, BinaryError> { - use std::io::Cursor; - let mut buff = Cursor::new(Vec::new()); - serialize_into(t, &mut buff)?; - let into_inner = buff.into_inner(); - Ok(into_inner) -} - -#[macro_export] -macro_rules! binary_fixed_size { - ($target_ty: ty) => { - impl BinaryConvertable for $target_ty where $target_ty: Copy { - fn from_bytes(bytes: &[u8], _length_stack: &mut ::std::collections::VecDeque) -> Result { - let size = ::std::mem::size_of::<$target_ty>(); - match bytes.len().cmp(&size) { - ::std::cmp::Ordering::Equal => (), - _ => return Err(BinaryConvertError::size(size, bytes.len())), - }; - let res: Self = unsafe { - let mut temp = ::std::mem::zeroed(); - let temp_ptr = &mut temp as *mut _ as *mut u8; - ::std::ptr::copy_nonoverlapping(bytes.as_ptr(), temp_ptr, size); - - temp - }; - - Ok(res) - } - - fn to_bytes(&self, buffer: &mut [u8], _length_stack: &mut ::std::collections::VecDeque) -> Result<(), BinaryConvertError> { - let sz = ::std::mem::size_of::<$target_ty>(); - let ip: *const $target_ty = self; - let ptr: *const u8 = ip as *const _; - unsafe { - ::std::ptr::copy(ptr, buffer.as_mut_ptr(), sz); - } - Ok(()) - } - } - } -} - -/// Fixed-sized version of Handshake struct -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub struct BinHandshake { - api_version: BinVersion, - protocol_version: BinVersion, -} - -/// Shorten version of semver Version without `pre` and `build` information -#[derive(Clone, Copy, Debug, PartialEq, Eq)] -pub struct BinVersion { - pub major: u64, - pub minor: u64, - pub patch: u64, -} - -impl From for BinHandshake { - fn from(other: Handshake) -> Self { - BinHandshake { - api_version: BinVersion::from(other.api_version), - protocol_version: BinVersion::from(other.protocol_version), - } - } -} - -impl BinHandshake { - pub fn to_semver(self) -> Handshake { - Handshake { - api_version: self.api_version.to_semver(), - protocol_version: self.protocol_version.to_semver(), - } - } -} - -impl BinVersion { - pub fn to_semver(self) -> ::semver::Version { - ::semver::Version { - major: self.major, - minor: self.minor, - patch: self.patch, - pre: vec![], - build: vec![], - } - } -} - -impl From<::semver::Version> for BinVersion { - fn from(other: ::semver::Version) -> Self { - BinVersion { - major: other.major, - minor: other.minor, - patch: other.patch, - } - } -} - -binary_fixed_size!(u16); -binary_fixed_size!(u64); -binary_fixed_size!(u32); -binary_fixed_size!(usize); -binary_fixed_size!(i32); -binary_fixed_size!(bool); -binary_fixed_size!(U256); -binary_fixed_size!(U512); -binary_fixed_size!(H256); -binary_fixed_size!(H512); -binary_fixed_size!(H2048); -binary_fixed_size!(Address); -binary_fixed_size!(BinHandshake); -binary_fixed_size!(BinVersion); - -impl BinaryConvertable for ::semver::Version { - fn from_bytes(bytes: &[u8], length_stack: &mut ::std::collections::VecDeque) -> Result { - BinVersion::from_bytes(bytes, length_stack).map(BinVersion::to_semver) - } - - fn to_bytes(&self, buffer: &mut [u8], length_stack: &mut ::std::collections::VecDeque) -> Result<(), BinaryConvertError> { - BinVersion::from(self.clone()).to_bytes(buffer, length_stack) - } -} - -#[test] -fn vec_serialize() { - let mut v = Vec::new(); - v.push(5u64); - v.push(10u64); - let mut length_stack = VecDeque::new(); - let mut data = Vec::with_capacity(v.size()); - unsafe { data.set_len(v.size()); } - let result = v.to_bytes(&mut data[..], &mut length_stack); - - assert!(result.is_ok()); - assert_eq!(5, data[0]); - assert_eq!(0, data[1]); - assert_eq!(10, data[8]); - assert_eq!(0, data[12]); -} - -#[test] -fn calculates_size() { - let mut v = Vec::new(); - v.push(5u64); - v.push(10u64); - - assert_eq!(16, v.size()); -} - -#[test] -fn vec_deserialize() { - let data = [ - 10u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - 5u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - ]; - - let mut length_stack = VecDeque::new(); - let vec = Vec::::from_bytes(&data[..], &mut length_stack).unwrap(); - - assert_eq!(vec![10u64, 5u64], vec); -} - -#[test] -fn vec_deserialize_chained() { - let mut v = Vec::new(); - v.push(Some(5u64)); - v.push(Some(10u64)); - v.push(None); - v.push(Some(12u64)); - - let mut length_stack = VecDeque::new(); - let mut data = Vec::with_capacity(v.size()); - unsafe { data.set_len(v.size()); } - let result = v.to_bytes(&mut data[..], &mut length_stack); - - assert!(result.is_ok()); - assert_eq!(4, length_stack.len()); -} - -#[test] -fn vec_serialize_deserialize() { - let mut v = Vec::new(); - v.push(Some(5u64)); - v.push(None); - v.push(Some(10u64)); - v.push(None); - v.push(Some(12u64)); - - - let mut data = Vec::with_capacity(v.size()); - unsafe { data.set_len(v.size()); } - let mut length_stack = VecDeque::new(); - - v.to_bytes(&mut data[..], &mut length_stack).unwrap(); - let de_v = Vec::>::from_bytes(&data[..], &mut length_stack).unwrap(); - - assert_eq!(v, de_v); -} - -#[test] -fn serialize_into_ok() { - use std::io::Cursor; - let mut buff = Cursor::new(vec![0; 128]); - - let mut v = Vec::new(); - v.push(Some(5u64)); - v.push(None); - v.push(Some(10u64)); - v.push(None); - v.push(Some(12u64)); - - serialize_into(&v, &mut buff).unwrap(); - assert_eq!(5, buff.get_ref()[0]); - assert_eq!(8, buff.get_ref()[8]); - assert_eq!(0, buff.get_ref()[16]); - assert_eq!(8, buff.get_ref()[24]); -} - -#[test] -fn deserialize_from_ok() { - use std::io::Cursor; - let mut buff = Cursor::new(vec![ - 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - 16u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - 10u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - 5u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - ]); - - let vec = deserialize_from::, _>(&mut buff).unwrap(); - - assert_eq!(vec![10u64, 5u64], vec); -} - -#[test] -fn serialize_into_deserialize_from() { - use std::io::{Cursor, SeekFrom, Seek}; - - let mut buff = Cursor::new(Vec::new()); - let mut v = Vec::new(); - v.push(Some(5u64)); - v.push(None); - v.push(Some(10u64)); - v.push(None); - v.push(Some(12u64)); - - serialize_into(&v, &mut buff).unwrap(); - buff.seek(SeekFrom::Start(0)).unwrap(); - let de_v = deserialize_from::>, _>(&mut buff).unwrap(); - assert_eq!(v, de_v); -} - -#[test] -fn serialize_vec_str() { - // empty - let source = Vec::::new(); - let serialized = serialize(&source).unwrap(); - let deserialized = deserialize::>(&serialized).unwrap(); - - assert_eq!(source, deserialized); - - // with few values - let mut source = Vec::::new(); - source.push("val1".to_owned()); - source.push("val2".to_owned()); - let serialized = serialize(&source).unwrap(); - let deserialized = deserialize::>(&serialized).unwrap(); - - assert_eq!(source, deserialized); -} - -#[test] -fn serialize_opt_str() { - // none - let source: Option = None; - let serialized = serialize(&source).unwrap(); - let deserialized = deserialize::>(&serialized).unwrap(); - - assert_eq!(source, deserialized); - - // value - let source: Option = Some("i have value".to_owned()); - let serialized = serialize(&source).unwrap(); - let deserialized = deserialize::>(&serialized).unwrap(); - - assert_eq!(source, deserialized); -} - -#[test] -fn serialize_opt_vec() { - use std::io::Cursor; - - let mut buff = Cursor::new(Vec::new()); - let optional_vec: Option> = None; - serialize_into(&optional_vec, &mut buff).unwrap(); - - assert_eq!(&vec![0u8; 16], buff.get_ref()); -} - -#[test] -fn serialize_opt_vec_payload() { - let optional_vec: Option> = None; - let payload = serialize(&optional_vec).unwrap(); - - assert_eq!(vec![0u8;16], payload); -} - -#[test] -fn deserialize_opt_vec() { - use std::io::Cursor; - let mut buff = Cursor::new(vec![0u8; 16]); - - let vec = deserialize_from::>, _>(&mut buff).unwrap(); - - assert!(vec.is_none()); -} - -#[test] -fn deserialize_simple_err() { - use std::io::Cursor; - let mut buff = Cursor::new(vec![0u8; 16]); - - let result = deserialize_from::, _>(&mut buff).unwrap(); - - assert!(result.is_ok()); -} - -#[test] -fn serialize_opt_vec_in_out() { - use std::io::{Cursor, SeekFrom, Seek}; - - let mut buff = Cursor::new(Vec::new()); - let optional_vec: Option> = None; - serialize_into(&optional_vec, &mut buff).unwrap(); - - buff.seek(SeekFrom::Start(0)).unwrap(); - let vec = deserialize_from::>, _>(&mut buff).unwrap(); - - assert!(vec.is_none()); -} - -#[test] -fn serialize_err_opt_vec_in_out() { - use std::io::{Cursor, SeekFrom, Seek}; - - let mut buff = Cursor::new(Vec::new()); - let optional_vec: Result>, u32> = Ok(None); - serialize_into(&optional_vec, &mut buff).unwrap(); - - buff.seek(SeekFrom::Start(0)).unwrap(); - let vec = deserialize_from::>, u32>, _>(&mut buff).unwrap(); - - assert!(vec.is_ok()); -} - -#[test] -fn serialize_btree() { - use std::io::{Cursor, SeekFrom, Seek}; - - let mut buff = Cursor::new(Vec::new()); - let mut btree = BTreeMap::new(); - btree.insert(1u64, 5u64); - serialize_into(&btree, &mut buff).unwrap(); - - buff.seek(SeekFrom::Start(0)).unwrap(); - let res = deserialize_from::, _>(&mut buff).unwrap(); - - assert_eq!(res[&1u64], 5u64); -} - -#[test] -fn serialize_refcell() { - use std::cell::RefCell; - - let source = RefCell::new(vec![5u32, 12u32, 19u32]); - let serialized = serialize(&source).unwrap(); - let deserialized = deserialize::>>(&serialized).unwrap(); - - assert_eq!(source, deserialized); -} - -#[test] -fn serialize_cell() { - use std::cell::Cell; - use std::str::FromStr; - - let source = Cell::new(U256::from_str("01231231231239999").unwrap()); - let serialized = serialize(&source).unwrap(); - let deserialized = deserialize::>(&serialized).unwrap(); - - assert_eq!(source, deserialized); -} - -#[test] -fn serialize_handshake() { - use std::io::{Cursor, SeekFrom, Seek}; - - let mut buff = Cursor::new(Vec::new()); - - let handshake = Handshake { - api_version: ::semver::Version::parse("1.2.0").unwrap(), - protocol_version: ::semver::Version::parse("1.2.0").unwrap(), - }; - - serialize_into(&BinHandshake::from(handshake.clone()), &mut buff).unwrap(); - - buff.seek(SeekFrom::Start(0)).unwrap(); - let res = deserialize_from::(&mut buff).unwrap().to_semver(); - - assert_eq!(res, handshake); -} - -#[test] -fn serialize_invalid_size() { - // value - let deserialized = deserialize::(&[]); - match deserialized { - Err(BinaryError::Serialization( - BinaryConvertError { - kind: BinaryConvertErrorKind::SizeMismatch { expected: 8, found: 0 }, - member_tree: _ - })) => {}, - other => panic!("Not a size mismatched error but: {:?}", other), - } -} - -#[test] -fn serialize_boundaries() { - // value - let deserialized = deserialize::>( - &[ - // payload header - 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - 2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - // - 0u8, 0u8, 0u8, 5u8, - 0u8, 0u8, 0u8, 4u8, - 1u8, 1u8, /* not 4 bytes */ - ] - ); - match deserialized { - Err(BinaryError::Serialization( - BinaryConvertError { - kind: BinaryConvertErrorKind::InconsistentBoundaries, - member_tree: _ - })) => {}, - other => panic!("Not an inconsistent boundaries error but: {:?}", other), - } -} - -#[test] -fn serialize_empty_try() { - // value - let mut stack = VecDeque::new(); - let mut data = vec![0u8; 16]; - let sample: Option> = None; - let serialized = sample.to_bytes(&mut data, &mut stack); - match serialized { - Err(BinaryConvertError { - kind: BinaryConvertErrorKind::TargetPayloadEmpty, - member_tree: _ - }) => {}, - other => panic!("Not an error about empty payload to be produced but: {:?}", other), - } -} - -#[test] -fn serialize_not_enough_lengths() { - // value - let deserialized = deserialize::>>( - &[ - // payload header - 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - 2u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, 0u8, - // does not matter because no length param for the first option - 0u8, - ] - ); - match deserialized { - Err(BinaryError::Serialization( - BinaryConvertError { - kind: BinaryConvertErrorKind::MissingLengthValue, - member_tree: _ - })) => {}, - other => panic!("Not an missing length param error but: {:?}", other), - } -} - -#[test] -fn vec_of_vecs() { - let sample = vec![vec![5u8, 10u8], vec![], vec![9u8, 11u8]]; - let serialized = serialize(&sample).unwrap(); - let deserialized = deserialize::>>(&serialized).unwrap(); - assert_eq!(sample, deserialized); - - // empty - let sample: Vec> = vec![]; - let serialized = serialize(&sample).unwrap(); - let deserialized = deserialize::>>(&serialized).unwrap(); - assert_eq!(sample, deserialized); -} diff --git a/ipc/rpc/src/interface.rs b/ipc/rpc/src/interface.rs deleted file mode 100644 index 846b7c1b67d2838c792f5951bc6a772609db3c71..0000000000000000000000000000000000000000 --- a/ipc/rpc/src/interface.rs +++ /dev/null @@ -1,106 +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 . - -//! IPC RPC interface - -use std::io::{Read, Write}; -use std::marker::Sync; -use semver::Version; - -#[derive(Debug, PartialEq, Eq, Clone)] -/// Handshake for client and server to negotiate api/protocol version -pub struct Handshake { - pub protocol_version: Version, - pub api_version: Version, -} - -/// Allows to configure custom version and custom handshake response for -/// ipc host -pub trait IpcConfig { - /// Current service api version - /// Should be increased if any of the methods changes signature - fn api_version() -> Version { - Version::parse("1.0.0").unwrap() - } - - /// Current ipc protocol version - /// Should be increased only if signature of system methods changes - fn protocol_version() -> Version { - Version::parse("1.0.0").unwrap() - } - - /// Default handshake requires exact versions match - fn handshake(handshake: &Handshake) -> bool { - handshake.protocol_version == Self::protocol_version() && - handshake.api_version == Self::api_version() - } -} - -/// Error in dispatching or invoking methods via IPC -#[derive(Debug)] -pub enum Error { - UnknownSystemCall, - ClientUnsupported, - RemoteServiceUnsupported, - HandshakeFailed, -} - -/// Allows implementor to be attached to generic worker and dispatch rpc requests -/// over IPC -pub trait IpcInterface : IpcConfig { - /// reads the message from io, dispatches the call and returns serialized result - fn dispatch(&self, r: &mut R) -> Vec where R: Read; - - /// deserializes the payload from buffer, dispatches invoke and returns serialized result - /// (for non-blocking io) - fn dispatch_buf(&self, method_num: u16, buf: &[u8]) -> Vec; -} - -/// serializes method invocation (method_num and parameters) to the stream specified by `w` -pub fn invoke(method_num: u16, params: &Option>, w: &mut W) where W: Write { - // creating buffer to contain all message - let buf_len = match *params { None => 2, Some(ref val) => val.len() + 2 }; - let mut buf = vec![0u8; buf_len]; - - // writing method_num as u16 - buf[1] = (method_num & 255) as u8; - buf[0] = (method_num >> 8) as u8; - - // serializing parameters only if provided with any - if params.is_some() { - buf[2..buf_len].clone_from_slice(params.as_ref().unwrap()); - } - - if w.write(&buf).unwrap() != buf_len - { - // if write was inconsistent - panic!("failed to write to socket"); - } -} - -/// IpcSocket, read/write generalization -pub trait IpcSocket: Read + Write + Sync + Send { -} - -/// Basically something that needs only socket to be spawned -pub trait WithSocket { - fn init(socket: S) -> Self; -} - - -impl IpcSocket for ::devtools::TestSocket {} - -impl IpcSocket for ::nanomsg::Socket {} diff --git a/ipc/rpc/src/lib.rs b/ipc/rpc/src/lib.rs deleted file mode 100644 index c6aff23b5d07b7da9746852697f0cb381cd925aa..0000000000000000000000000000000000000000 --- a/ipc/rpc/src/lib.rs +++ /dev/null @@ -1,28 +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 . - -//! IPC RPC interface - -extern crate ethcore_devtools as devtools; -extern crate semver; -extern crate nanomsg; -extern crate ethcore_util as util; -extern crate ethcore_bigint as bigint; - -pub mod interface; -pub mod binary; -pub use interface::{IpcInterface, IpcSocket, invoke, IpcConfig, Handshake, Error, WithSocket}; -pub use binary::{BinaryConvertable, BinaryConvertError, BinVersion, BinHandshake}; diff --git a/ipc/tests/Cargo.toml b/ipc/tests/Cargo.toml deleted file mode 100644 index 3bf5dc316eab885452275e57ecb1efac246a958e..0000000000000000000000000000000000000000 --- a/ipc/tests/Cargo.toml +++ /dev/null @@ -1,21 +0,0 @@ -[package] -name = "ethcore-ipc-tests" -version = "0.1.0" -authors = ["Parity Technologies "] -build = "build.rs" - -[lib] -path = "run.rs" - -[dependencies] -ethcore-ipc = { path = "../rpc" } -ethcore-devtools = { path = "../../devtools" } -semver = "0.6" -nanomsg = { git = "https://github.com/paritytech/nanomsg.rs.git", branch = "parity-1.7" } -ethcore-ipc-nano = { path = "../nano" } -ethcore-util = { path = "../../util" } -ethcore-bytes = { path = "../../util/bytes" } -log = "0.3" - -[build-dependencies] -ethcore-ipc-codegen = { path = "../codegen" } diff --git a/ipc/tests/binary.rs b/ipc/tests/binary.rs deleted file mode 100644 index 6eb1da8522546cd68a9e23a54c3622013784b5c3..0000000000000000000000000000000000000000 --- a/ipc/tests/binary.rs +++ /dev/null @@ -1,19 +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 . - -#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues - -include!(concat!(env!("OUT_DIR"), "/binary.rs.in")); diff --git a/ipc/tests/binary.rs.in b/ipc/tests/binary.rs.in deleted file mode 100644 index 8b04f683b31ba1dabdfdb148752b2421e6ccaeb0..0000000000000000000000000000000000000000 --- a/ipc/tests/binary.rs.in +++ /dev/null @@ -1,169 +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 . - - -use bytes::Bytes; - -#[binary] -pub enum Root { - Top, - Middle(u32, u64), -} - -#[derive(PartialEq, Debug)] -#[binary] -pub struct DoubleRoot { - pub x1: u32, - pub x2: u64, - pub x3: u32, -} - -#[derive(PartialEq, Debug)] -#[binary] -pub struct ReferenceStruct<'a> { - pub ref_data: &'a u64, -} - -#[derive(PartialEq, Debug)] -#[binary] -pub enum EnumWithStruct { - Left, - Right { how_much: u64 }, -} - -#[binary] -pub struct TwoVec { - v1: Vec, - v2: Vec, -} - -#[binary] -struct ChunkSet { - items: Vec, -} - -#[test] -fn opt_two_vec() { - let example: Option = None; - - let serialized = ::ipc::binary::serialize(&example).unwrap(); - assert_eq!(serialized, vec![0u8; 16]); -} - -#[test] -fn enum_with_struct() { - let example = EnumWithStruct::Right { how_much: 15 }; - let serialized = ::ipc::binary::serialize(&example).unwrap(); - let deserialized = ::ipc::binary::deserialize::(&serialized).unwrap(); - assert_eq!(example, deserialized); -} - -#[test] -fn chunks() { - let sample: Vec = vec! [ - 15, 0, 0, 0, 0, 0, 0, 0, 81, 6, 0, 0, 0, 0, 0, 0, - 110, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 173, 0, 0, 0, 0, 0, 0, 0, 103, 0, 0, 0, 0, 0, 0, 0, - 112, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 107, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 114, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 114, 0, 0, 0, 0, 0, 0, 0, 112, 0, 0, 0, 0, 0, 0, 0, - 81, 6, 0, 0, 0, 0, 0, 0, - - 248, 108, 58, 133, 4, 168, 23, 200, 0, 130, 82, 8, 148, 182, 54, - 177, 224, 198, 163, 123, 250, 122, 157, 158, 75, 138, 30, 7, 83, 91, 141, 56, 46, 136, 2, - 197, 12, 243, 220, 69, 192, 0, 128, 28, 160, 32, 232, 123, 221, 90, 116, 93, 94, 136, 78, - 235, 200, 167, 154, 3, 175, 74, 53, 133, 32, 239, 199, 169, 46, 95, 111, 114, 204, 19, 138, - 15, 167, 160, 103, 72, 60, 241, 165, 248, 130, 213, 45, 166, 249, 102, 83, 87, 98, 153, - 68, 58, 13, 83, 193, 182, 217, 182, 9, 241, 217, 28, 162, 152, 114, 136, 248, 110, 130, 6, - 96, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, - 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, - 128, 27, 160, 206, 145, 163, 186, 24, 122, 126, 115, 80, 203, 152, 219, 160, 243, 1, 139, - 109, 199, 115, 50, 159, 197, 95, 184, 174, 53, 150, 3, 200, 82, 138, 22, 160, 119, 226, - 202, 208, 136, 165, 174, 240, 216, 222, 27, 214, 12, 213, 250, 68, 214, 144, 120, 53, 158, - 46, 124, 105, 87, 220, 213, 192, 28, 81, 118, 6, 248, 110, 130, 6, 95, 133, 4, 168, 23, - 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, - 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, 19, 172, 66, - 208, 28, 189, 213, 239, 125, 170, 127, 147, 190, 97, 171, 194, 229, 241, 178, 176, 111, - 3, 201, 217, 9, 179, 23, 159, 159, 64, 55, 225, 160, 7, 123, 227, 76, 149, 80, 48, 130, - 122, 23, 165, 175, 24, 89, 228, 128, 25, 106, 160, 195, 82, 204, 206, 150, 83, 70, 127, - 34, 221, 169, 80, 43, 248, 110, 130, 6, 102, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, - 100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, - 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, 29, 6, 237, 5, 67, 42, 51, 65, 172, 133, - 9, 222, 160, 39, 202, 88, 230, 123, 232, 135, 234, 5, 244, 215, 99, 129, 242, 59, 63, 36, - 26, 253, 160, 104, 178, 37, 227, 142, 255, 186, 41, 91, 108, 206, 13, 108, 24, 73, 229, - 96, 224, 142, 230, 93, 214, 27, 60, 119, 149, 119, 56, 62, 5, 204, 179, 248, 171, 129, 136, - 133, 4, 168, 23, 200, 0, 131, 2, 77, 248, 148, 137, 32, 90, 58, 59, 42, 105, 222, 109, 191, - 127, 1, 237, 19, 178, 16, 139, 44, 67, 231, 128, 184, 68, 169, 5, 156, 187, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 105, 4, 134, 47, 167, 212, 79, 177, 44, 91, 97, 85, 184, 182, 222, 59, 231, 242, - 110, 141, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 2, 28, 160, 98, 5, 133, 180, 19, 27, 159, 186, 76, 27, 159, 143, 186, 97, 124, 253, 123, 40, - 87, 35, 184, 115, 99, 176, 68, 85, 191, 210, 218, 132, 220, 52, 160, 48, 160, 79, 26, 47, 127, 253, - 55, 252, 196, 196, 129, 87, 131, 132, 84, 74, 166, 33, 85, 134, 25, 34, 244, 14, 1, 16, 1, 205, 34, - 30, 3, 248, 101, 3, 133, 13, 43, 184, 47, 225, 131, 1, 95, 144, 148, 202, 110, 19, 32, 65, 111, 158, - 204, 235, 91, 252, 213, 35, 215, 54, 91, 165, 67, 183, 171, 1, 128, 28, 160, 182, 194, 27, 223, 136, - 182, 189, 146, 57, 61, 173, 62, 58, 241, 42, 80, 125, 174, 84, 191, 82, 124, 228, 62, 216, 233, 116, - 117, 227, 207, 138, 56, 160, 31, 210, 242, 212, 31, 156, 129, 155, 166, 64, 102, 140, 134, 35, 176, - 137, 201, 206, 213, 199, 238, 132, 185, 145, 220, 217, 151, 80, 243, 93, 71, 211, 248, 110, 130, - 6, 101, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, 105, - 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, - 86, 37, 61, 45, 13, 251, 9, 19, 188, 242, 233, 83, 77, 137, 28, 185, 141, 105, 217, 54, 182, 156, - 119, 223, 213, 112, 240, 20, 119, 167, 4, 7, 160, 95, 53, 122, 159, 6, 209, 70, 155, 122, 153, 165, - 192, 249, 223, 219, 83, 159, 40, 242, 39, 44, 132, 182, 208, 232, 77, 64, 178, 241, 233, 230, 253, - 248, 110, 130, 6, 99, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, - 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, - 27, 160, 114, 33, 104, 64, 195, 12, 156, 235, 56, 59, 210, 102, 183, 210, 216, 137, 223, 207, 134, - 63, 65, 36, 204, 121, 38, 175, 214, 106, 184, 197, 26, 173, 160, 39, 94, 238, 34, 106, 190, 22, - 225, 95, 211, 192, 249, 95, 231, 1, 111, 8, 204, 133, 35, 84, 242, 134, 75, 61, 50, 26, 150, 46, - 209, 129, 155, 248, 105, 106, 133, 5, 103, 130, 1, 225, 131, 2, 130, 119, 148, 191, 78, 215, 178, - 127, 29, 102, 101, 70, 227, 13, 116, 213, 13, 23, 61, 32, 188, 167, 84, 128, 132, 60, 207, 214, - 11, 28, 160, 3, 83, 228, 182, 32, 30, 183, 26, 157, 247, 32, 142, 60, 192, 100, 175, 106, 216, - 144, 16, 100, 165, 95, 91, 135, 138, 14, 41, 82, 251, 207, 159, 160, 74, 160, 161, 187, 63, 216, - 18, 23, 64, 172, 216, 238, 192, 134, 191, 204, 206, 236, 197, 134, 116, 130, 15, 85, 113, 173, - 130, 39, 50, 160, 49, 222, 248, 110, 130, 6, 98, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, - 100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, - 6, 10, 36, 24, 30, 64, 0, 128, 28, 160, 138, 12, 20, 188, 112, 66, 91, 30, 216, 44, 24, 124, 242, - 200, 111, 179, 32, 26, 37, 221, 239, 110, 1, 84, 48, 89, 86, 61, 169, 129, 90, 21, 160, 44, 172, - 112, 11, 130, 45, 247, 188, 207, 91, 247, 195, 58, 188, 110, 127, 59, 227, 41, 151, 244, 41, 120, - 68, 185, 238, 41, 236, 195, 141, 38, 16, 248, 112, 131, 5, 238, 44, 133, 4, 168, 23, 200, 0, 131, - 1, 95, 144, 148, 5, 113, 9, 145, 204, 89, 103, 32, 126, 46, 182, 84, 47, 76, 28, 159, 77, 184, - 154, 59, 136, 1, 100, 240, 147, 154, 69, 101, 18, 128, 27, 160, 130, 0, 124, 82, 177, 112, 241, - 14, 47, 186, 67, 117, 176, 187, 147, 94, 4, 177, 218, 198, 55, 59, 245, 9, 142, 95, 88, 220, 63, - 98, 175, 49, 160, 17, 204, 228, 24, 242, 38, 166, 219, 17, 56, 103, 244, 33, 125, 223, 45, 43, - 252, 215, 163, 40, 1, 187, 152, 34, 229, 82, 180, 213, 148, 129, 32, 248, 110, 130, 6, 100, 133, - 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, - 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, 10, 36, 24, 30, 64, 0, 128, 27, 160, 149, 149, 154, - 6, 198, 127, 14, 11, 164, 0, 244, 4, 74, 83, 9, 108, 164, 66, 186, 26, 109, 69, 98, 41, 149, 33, - 238, 137, 23, 175, 124, 226, 160, 39, 249, 210, 237, 52, 83, 110, 229, 138, 84, 199, 64, 19, 209, - 156, 195, 9, 50, 184, 64, 78, 67, 158, 167, 121, 220, 80, 137, 104, 240, 50, 60, 248, 112, 131, 5, - 238, 45, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 247, 0, 201, 156, 113, 12, 158, 3, 208, 61, - 221, 91, 236, 235, 235, 195, 40, 46, 100, 73, 136, 13, 230, 68, 67, 114, 161, 197, 100, 128, 27, - 160, 123, 206, 0, 221, 2, 87, 197, 156, 109, 157, 133, 31, 26, 145, 223, 150, 235, 160, 54, 144, - 210, 146, 31, 173, 221, 128, 233, 148, 73, 82, 191, 220, 160, 57, 62, 114, 94, 77, 8, 116, 150, - 51, 112, 241, 70, 149, 157, 209, 193, 213, 109, 248, 102, 177, 27, 132, 226, 77, 141, 128, 122, - 185, 238, 188, 114, 248, 110, 130, 6, 97, 133, 4, 168, 23, 200, 0, 131, 1, 95, 144, 148, 100, - 131, 212, 219, 190, 174, 5, 47, 105, 201, 11, 11, 210, 108, 207, 242, 164, 74, 218, 19, 135, 6, - 10, 36, 24, 30, 64, 0, 128, 28, 160, 53, 222, 41, 101, 73, 44, 103, 26, 39, 165, 120, 194, 128, - 67, 109, 151, 96, 42, 193, 47, 255, 23, 27, 247, 8, 125, 200, 53, 129, 69, 103, 64, 160, 49, 12, - 64, 143, 74, 149, 161, 245, 68, 83, 89, 101, 212, 254, 81, 16, 170, 176, 33, 87, 6, 112, 34, 153, - 6, 192, 98, 126, 188, 17, 199, 155]; - - let chunks = ::ipc::binary::deserialize::(&sample).unwrap(); - let total_length = chunks.items.iter().fold(0usize, |total, item| total + item.len()); - - assert_eq!(1617, total_length); -} diff --git a/ipc/tests/build.rs b/ipc/tests/build.rs deleted file mode 100644 index 7f68b16a892bb30e110906863186831add5e00de..0000000000000000000000000000000000000000 --- a/ipc/tests/build.rs +++ /dev/null @@ -1,24 +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 . - -extern crate ethcore_ipc_codegen as codegen; - -pub fn main() { - codegen::derive_ipc("nested.rs.in").unwrap(); - codegen::derive_ipc("service.rs.in").unwrap(); - codegen::derive_ipc("with_attrs.rs.in").unwrap(); - codegen::derive_binary("binary.rs.in").unwrap(); -} diff --git a/ipc/tests/examples.rs b/ipc/tests/examples.rs deleted file mode 100644 index 8cd2d2ea5c6bceb0029253db654b6d57e1c9b4c3..0000000000000000000000000000000000000000 --- a/ipc/tests/examples.rs +++ /dev/null @@ -1,173 +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 . - -#[cfg(test)] -mod tests { - - use super::super::service::*; - use super::super::binary::*; - use super::super::nested::{DBClient, DBWriter}; - use ipc::*; - use devtools::*; - use semver::Version; - use std::sync::Arc; - - #[test] - fn call_service() { - // method_num = 0, f = 10 (method Service::commit) - let mut socket = TestSocket::new_ready(vec![ - 0, 16, - 0, 0, 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 0, 0, 0, 0, - 10, 0, 0, 0]); - - let service = Arc::new(Service::new()); - assert_eq!(0, *service.commits.read().unwrap()); - - service.dispatch(&mut socket); - - assert_eq!(10, *service.commits.read().unwrap()); - } - - #[test] - fn call_service_client() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![10, 0, 0, 0]; - let service_client = ServiceClient::init(socket); - - let result = service_client.commit(5); - - assert_eq!( - vec![0, 16, - 0, 0, 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 0, 0, 0, 0, - 5, 0, 0, 0], - service_client.socket().write().unwrap().write_buffer.clone()); - assert_eq!(10, result); - } - - #[test] - fn call_service_client_optional() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![10, 0, 0, 0]; - let service_client = ServiceClient::init(socket); - - let result = service_client.rollback(Some(5), 10); - - assert_eq!(vec![ - 0, 17, - 1, 0, 0, 0, 0, 0, 0, 0, - 4, 0, 0, 0, 0, 0, 0, 0, - 8, 0, 0, 0, 0, 0, 0, 0, - 5, 0, 0, 0, 10, 0, 0, 0], service_client.socket().write().unwrap().write_buffer.clone()); - assert_eq!(10, result); - } - - #[test] - fn query_default_version() { - let ver = Service::protocol_version(); - assert_eq!(ver, Version::parse("1.0.0").unwrap()); - let ver = Service::api_version(); - assert_eq!(ver, Version::parse("1.0.0").unwrap()); - } - - #[test] - fn call_service_client_handshake() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![1]; - let service_client = ServiceClient::init(socket); - - let result = service_client.handshake(); - - assert!(result.is_ok()); - } - - #[test] - fn can_use_custom_params() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![1]; - let service_client = ServiceClient::init(socket); - - let result = service_client.push_custom(CustomData { a: 3, b: 11}); - - assert_eq!(vec![ - // message num.. - 0, 18, - // variable size length-s - 1, 0, 0, 0, 0, 0, 0, 0, - 16, 0, 0, 0, 0, 0, 0, 0, - // total length - 16, 0, 0, 0, 0, 0, 0, 0, - // items - 3, 0, 0, 0, 0, 0, 0, 0, - 11, 0, 0, 0, 0, 0, 0, 0], - service_client.socket().write().unwrap().write_buffer.clone()); - assert_eq!(true, result); - } - - #[test] - fn can_invoke_generic_service() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]; - let db_client = DBClient::::init(socket); - let result = db_client.write(vec![1u8; 1]); - assert_eq!(vec![0, 16, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1], - db_client.socket().write().unwrap().write_buffer.clone()); - assert!(result.is_ok()); - } - - #[test] - fn can_handshake_generic_service() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![1]; - let db_client = DBClient::::init(socket); - - let result = db_client.handshake(); - - assert!(result.is_ok()); - } - - #[test] - fn can_serialize_dummy_structs() { - let mut socket = TestSocket::new(); - - let struct_ = DoubleRoot { x1: 0, x2: 100, x3: 100000}; - let res = ::ipc::binary::serialize_into(&struct_, &mut socket); - - assert!(res.is_ok()); - - let mut read_socket = TestSocket::new_ready(socket.write_buffer.clone()); - let new_struct: DoubleRoot = ::ipc::binary::deserialize_from(&mut read_socket).unwrap(); - - assert_eq!(struct_, new_struct); - } - - #[test] - fn can_call_void_method() { - let mut socket = TestSocket::new(); - socket.read_buffer = vec![1]; - let service_client = ServiceClient::init(socket); - - service_client.void(99); - - assert_eq!(vec![ - 0, 19, - 0, 0, 0, 0, 0, 0, 0, 0, - 8, 0, 0, 0, 0, 0, 0, 0, - 99, 0, 0, 0, 0, 0, 0, 0], - service_client.socket().write().unwrap().write_buffer.clone()); - } -} diff --git a/ipc/tests/nested.rs b/ipc/tests/nested.rs deleted file mode 100644 index ab3f9fc1b9cd8595fc2ba9abdc7ee9a1528792de..0000000000000000000000000000000000000000 --- a/ipc/tests/nested.rs +++ /dev/null @@ -1,18 +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 . - -#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues -include!(concat!(env!("OUT_DIR"), "/nested.rs.in")); diff --git a/ipc/tests/nested.rs.in b/ipc/tests/nested.rs.in deleted file mode 100644 index e68bec0d764f84dea6dea385fee3f13c695ce5e1..0000000000000000000000000000000000000000 --- a/ipc/tests/nested.rs.in +++ /dev/null @@ -1,56 +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 . - -use std::sync::RwLock; -use ipc::IpcConfig; - -pub struct DB { - pub writes: RwLock, - pub reads: RwLock, - pub holdings: L, -} - -pub trait DBWriter { - fn write(&self, data: Vec) -> Result<(), DBError>; - fn write_slice(&self, data: &[u8]) -> Result<(), DBError>; -} - -impl IpcConfig for DBWriter {} - -#[binary] -pub enum DBError { Write, Read } - -#[ipc] -impl DBWriter for DB { - fn write(&self, data: Vec) -> Result<(), DBError> { - let mut writes = self.writes.write().unwrap(); - *writes = *writes + data.len() as u64; - Ok(()) - } - - fn write_slice(&self, data: &[u8]) -> Result<(), DBError> { - let mut writes = self.writes.write().unwrap(); - *writes = *writes + data.len() as u64; - Ok(()) - } -} - -#[ipc] -trait DBNotify { - fn notify(&self, a: u64, b: u64) -> bool; -} - -impl IpcConfig for DBNotify { } diff --git a/ipc/tests/over_nano.rs b/ipc/tests/over_nano.rs deleted file mode 100644 index 6f45dd24552a5c7117533bef4d0f6bcbb27e7bea..0000000000000000000000000000000000000000 --- a/ipc/tests/over_nano.rs +++ /dev/null @@ -1,77 +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 . - -#[cfg(test)] -mod tests { - - use super::super::service::*; - use super::super::with_attrs::PrettyNamedClient; - use nanoipc; - use std::sync::Arc; - use std::io::Write; - use std::sync::atomic::{Ordering, AtomicBool}; - - fn dummy_write(addr: &str, buf: &[u8]) -> (::nanomsg::Socket, ::nanomsg::Endpoint) { - let mut socket = ::nanomsg::Socket::new(::nanomsg::Protocol::Pair).unwrap(); - let endpoint = socket.connect(addr).unwrap(); - socket.write(buf).unwrap(); - (socket, endpoint) - } - - - fn init_worker(addr: &str) -> nanoipc::Worker { - let mut worker = nanoipc::Worker::::new(&Arc::new(Service::new())); - worker.add_duplex(addr).unwrap(); - worker - } - - #[test] - fn can_create_client() { - let client = nanoipc::init_duplex_client::>("ipc:///tmp/parity-nano-test10.ipc"); - assert!(client.is_ok()); - } - - #[test] - fn can_create_renamed_client() { - let client = nanoipc::init_duplex_client::>("ipc:///tmp/parity-nano-test10.ipc"); - assert!(client.is_ok()); - } - - #[test] - fn can_call_handshake() { - let url = "ipc:///tmp/parity-test-nano-20.ipc"; - let worker_should_exit = Arc::new(AtomicBool::new(false)); - let worker_is_ready = Arc::new(AtomicBool::new(false)); - let c_worker_should_exit = worker_should_exit.clone(); - let c_worker_is_ready = worker_is_ready.clone(); - - ::std::thread::spawn(move || { - let mut worker = init_worker(url); - while !c_worker_should_exit.load(Ordering::Relaxed) { - worker.poll(); - c_worker_is_ready.store(true, Ordering::Relaxed); - } - }); - - while !worker_is_ready.load(Ordering::Relaxed) { } - let client = nanoipc::init_duplex_client::>(url).unwrap(); - - let hs = client.handshake(); - - worker_should_exit.store(true, Ordering::Relaxed); - assert!(hs.is_ok()); - } -} diff --git a/ipc/tests/service.rs b/ipc/tests/service.rs deleted file mode 100644 index 56b9915db660ed1d75b219e5d19e000d8c23684a..0000000000000000000000000000000000000000 --- a/ipc/tests/service.rs +++ /dev/null @@ -1,18 +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 . - -#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues -include!(concat!(env!("OUT_DIR"), "/service.rs.in")); diff --git a/ipc/tests/service.rs.in b/ipc/tests/service.rs.in deleted file mode 100644 index 68d40efc402e8f4696c19fc0cc85e0cc6e441973..0000000000000000000000000000000000000000 --- a/ipc/tests/service.rs.in +++ /dev/null @@ -1,69 +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 . - -use std::sync::RwLock; -use ipc::IpcConfig; - -pub struct Service { - pub commits: RwLock, - pub rollbacks: RwLock, -} - -#[binary] -pub struct CustomData { - pub a: u64, - pub b: u64, -} - -#[ipc] -impl Service { - fn commit(&self, f: u32) -> u32 { - let mut lock = self.commits.write().unwrap(); - *lock = *lock + f as usize; - f - } - - pub fn rollback(&self, a: Option, b: u32) -> i32 { - let a_0 = a.unwrap_or_else(|| 0); - let mut lock = self.rollbacks.write().unwrap(); - *lock = *lock + a_0 as usize - b as usize; - (a_0 - b) as i32 - } - - pub fn push_custom(&self, data: CustomData) -> bool { - let mut clock = self.commits.write().unwrap(); - let mut rlock = self.commits.write().unwrap(); - - *clock = data.a as usize; - *rlock = data.b as usize; - - true - } - - pub fn void(&self, a: u64) { - } -} - -impl Service { - pub fn new() -> Service { - Service { - commits: RwLock::new(0usize), - rollbacks: RwLock::new(0usize), - } - } -} - -impl ::ipc::IpcConfig for Service {} diff --git a/ipc/tests/with_attrs.rs b/ipc/tests/with_attrs.rs deleted file mode 100644 index 89f3575f74fb655fb84e6813461720a2ea1bb5b0..0000000000000000000000000000000000000000 --- a/ipc/tests/with_attrs.rs +++ /dev/null @@ -1,18 +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 . - -#![allow(dead_code, unused_assignments, unused_variables)] // codegen issues -include!(concat!(env!("OUT_DIR"), "/with_attrs.rs.in")); diff --git a/js-old/.babelrc b/js-old/.babelrc new file mode 100644 index 0000000000000000000000000000000000000000..127abf1436306a1dfabc24c81b7e8de3116348d4 --- /dev/null +++ b/js-old/.babelrc @@ -0,0 +1,34 @@ +{ + "presets": [ + "es2017", "es2016", "es2015", + "stage-0", "react" + ], + "plugins": [ + "transform-decorators-legacy", + "transform-class-properties", + "transform-object-rest-spread", + "transform-es2015-modules-commonjs", + "transform-runtime", + "lodash", + "recharts" + ], + "retainLines": true, + "env": { + "production": { + "plugins": [ + "transform-react-remove-prop-types" + ] + }, + "development": { + "plugins": [ + [ "react-intl", { "messagesDir": "./.build/i18n/" } ], + "react-hot-loader/babel" + ] + }, + "test": { + "plugins": [ + [ "babel-plugin-webpack-alias", { "config": "webpack/test.js" } ] + ] + } + } +} diff --git a/js-old/.codeclimate.yml b/js-old/.codeclimate.yml new file mode 100644 index 0000000000000000000000000000000000000000..ca6414f5883de71b270a7f6de829837da85a2e4d --- /dev/null +++ b/js-old/.codeclimate.yml @@ -0,0 +1,8 @@ +engines: + eslint: + enabled: true + channel: "eslint-2" + +ratings: + paths: + - "**.js" diff --git a/js-old/.editorconfig b/js-old/.editorconfig new file mode 100644 index 0000000000000000000000000000000000000000..3c229b5dc188afe95adfd59e57d14cc599ead1eb --- /dev/null +++ b/js-old/.editorconfig @@ -0,0 +1,10 @@ +root = true +[*] +indent_style=space +indent_size=2 +tab_width=2 +end_of_line=lf +charset=utf-8 +trim_trailing_whitespace=true +max_line_length=120 +insert_final_newline=true diff --git a/js-old/.eslintrc.json b/js-old/.eslintrc.json new file mode 100644 index 0000000000000000000000000000000000000000..ffd4f03f3bfd4baa1e9f6c9b278a37d98307d266 --- /dev/null +++ b/js-old/.eslintrc.json @@ -0,0 +1,33 @@ +{ + "extends": ["semistandard", "standard-react"], + "parser": "babel-eslint", + "env": { + "browser": true, + "mocha": true, + "node": true + }, + "globals": { + "expect": true, + "FileReader": true + }, + "rules": { + "curly": ["error", "all"], + "jsx-quotes": ["error", "prefer-single"], + "newline-after-var": ["error", "always"], + "no-alert": "error", + "no-debugger": "error", + "no-duplicate-imports": ["error", { + "includeExports": true + }], + "object-curly-spacing": ["error", "always"], + "object-property-newline": 0, + "one-var-declaration-per-line": ["error", "always"], + "padded-blocks": ["error", { + "blocks": "never", + "classes": "never", + "switches": "never" + }], + "react/jsx-closing-bracket-location": "error", + "react/jsx-curly-spacing": ["error", "always"] + } +} diff --git a/js-old/.gitignore b/js-old/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..555c4b4bbd451223f4c6402fed37641e70b8edf7 --- /dev/null +++ b/js-old/.gitignore @@ -0,0 +1,10 @@ +node_modules +npm-debug.log +build +docs +.build +.coverage +.dist +.happypack +.npmjs +.eslintcache diff --git a/js-old/.istanbul.yml b/js-old/.istanbul.yml new file mode 100644 index 0000000000000000000000000000000000000000..4535167dbff60cc20d1452fde48a0e4aac5c841b --- /dev/null +++ b/js-old/.istanbul.yml @@ -0,0 +1,6 @@ +instrumentation: + root: src + extensions: + - .js +reporting: + dir: ./.coverage diff --git a/js-old/.npmignore b/js-old/.npmignore new file mode 100644 index 0000000000000000000000000000000000000000..5093a29b859a5e7a79413a37ad397761ec16415a --- /dev/null +++ b/js-old/.npmignore @@ -0,0 +1 @@ +scripts/ diff --git a/js-old/.npmrc b/js-old/.npmrc new file mode 100644 index 0000000000000000000000000000000000000000..5dce03c654cc25b7ca3434856903175edb8e6ff3 --- /dev/null +++ b/js-old/.npmrc @@ -0,0 +1,2 @@ +save-prefix='' +unsafe-perm=true diff --git a/js-old/.stylelintrc.json b/js-old/.stylelintrc.json new file mode 100644 index 0000000000000000000000000000000000000000..9248483c6ed9b2b1f78d5890a7592d3090dd4343 --- /dev/null +++ b/js-old/.stylelintrc.json @@ -0,0 +1,8 @@ +{ + "extends": "stylelint-config-standard", + "rules": { + "selector-pseudo-class-no-unknown": [ + true, { "ignorePseudoClasses": ["global"] } + ] + } +} diff --git a/js-old/Cargo.precompiled.toml b/js-old/Cargo.precompiled.toml new file mode 100644 index 0000000000000000000000000000000000000000..9e3b640b704486b03fa238b1700479bed6f7811e --- /dev/null +++ b/js-old/Cargo.precompiled.toml @@ -0,0 +1,19 @@ +[package] +description = "Parity built-in dapps." +name = "parity-ui-old-precompiled" +version = "1.9.0" +license = "GPL-3.0" +authors = ["Parity Technologies "] +build = "build.rs" + +[features] +default = ["with-syntex", "use-precompiled-js"] +use-precompiled-js = ["parity-dapps-glue/use-precompiled-js"] +with-syntex = ["parity-dapps-glue/with-syntex"] + +[build-dependencies] +parity-dapps-glue = "1.9" + +[dependencies] +parity-dapps-glue = "1.9" + diff --git a/js-old/Cargo.toml b/js-old/Cargo.toml new file mode 100644 index 0000000000000000000000000000000000000000..6c86b9e0162171589329fc7033dd9a10da7c5cb6 --- /dev/null +++ b/js-old/Cargo.toml @@ -0,0 +1,18 @@ +[package] +description = "Parity built-in dapps." +name = "parity-ui-old-dev" +version = "1.9.0" +license = "GPL-3.0" +authors = ["Parity Technologies "] +build = "build.rs" + +[features] +default = ["with-syntex"] +with-syntex = ["parity-dapps-glue/with-syntex"] + +[build-dependencies] +parity-dapps-glue = "1.9" + +[dependencies] +parity-dapps-glue = "1.9" + diff --git a/js-old/LICENSE b/js-old/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..9cecc1d4669ee8af2ca727a5d8cde10cd8b2d7cc --- /dev/null +++ b/js-old/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + {one line to give the program's name and a brief idea of what it does.} + Copyright (C) {year} {name of author} + + This program 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. + + This program 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 this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + {project} Copyright (C) {year} {fullname} + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/js-old/README.md b/js-old/README.md new file mode 100644 index 0000000000000000000000000000000000000000..5ed26e0cfd3a385cb22e1c761c64e888cf179e2b --- /dev/null +++ b/js-old/README.md @@ -0,0 +1,12 @@ +# parity.js + +JavaScript APIs and UIs for Parity. + +## development + +0. Install [Node](https://nodejs.org/) if not already available +0. Change to the `js` directory inside `parity/` +0. Install the npm modules via `npm install` +0. Parity should be run with `parity --ui-no-validation [...options]` (where `options` can be `--chain testnet`) +0. Start the development environment via `npm start` +0. Connect to the [UI](http://localhost:3000) diff --git a/js/assets/fonts/Roboto/LICENSE.txt b/js-old/assets/fonts/Roboto/LICENSE.txt similarity index 100% rename from js/assets/fonts/Roboto/LICENSE.txt rename to js-old/assets/fonts/Roboto/LICENSE.txt diff --git a/js/assets/fonts/Roboto/font.css b/js-old/assets/fonts/Roboto/font.css similarity index 100% rename from js/assets/fonts/Roboto/font.css rename to js-old/assets/fonts/Roboto/font.css diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Black.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Black.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Black.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Black.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-BlackItalic.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Bold.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Bold.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Bold.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Bold.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-BoldItalic.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Italic.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Italic.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Italic.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Italic.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Light.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Light.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Light.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Light.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-LightItalic.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Medium.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Medium.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Medium.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Medium.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-MediumItalic.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Regular.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Regular.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Regular.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Regular.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-Thin.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-Thin.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-Thin.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-Thin.ttf diff --git a/js/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf b/js-old/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf similarity index 100% rename from js/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf rename to js-old/assets/fonts/Roboto/ttf/Roboto-ThinItalic.ttf diff --git a/js/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js-old/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2 rename to js-old/assets/fonts/Roboto/v15/-L14Jk06m6pUHB-5mXQQnYX0hVgzZQUfRDuZrPvH3D8.woff2 diff --git a/js/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2 b/js-old/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2 rename to js-old/assets/fonts/Roboto/v15/0eC6fl06luXEYWpBSJvXCIX0hVgzZQUfRDuZrPvH3D8.woff2 diff --git a/js/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js-old/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2 rename to js-old/assets/fonts/Roboto/v15/Fl4y0QdOxyyTHEGMXX8kcYX0hVgzZQUfRDuZrPvH3D8.woff2 diff --git a/js/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2 b/js-old/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2 rename to js-old/assets/fonts/Roboto/v15/Hgo13k-tfSpn0qi1SFdUfZBw1xU1rKptJj_0jans920.woff2 diff --git a/js/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js-old/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2 rename to js-old/assets/fonts/Roboto/v15/I3S1wsgSg9YCurV6PUkTOYX0hVgzZQUfRDuZrPvH3D8.woff2 diff --git a/js/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2 b/js-old/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2 rename to js-old/assets/fonts/Roboto/v15/NYDWBdD4gIq26G5XYbHsFIX0hVgzZQUfRDuZrPvH3D8.woff2 diff --git a/js/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2 b/js-old/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2 similarity index 100% rename from js/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2 rename to js-old/assets/fonts/Roboto/v15/Pru33qjShpZSmG3z6VYwnYX0hVgzZQUfRDuZrPvH3D8.woff2 diff --git a/js/assets/fonts/RobotoMono/LICENSE.txt b/js-old/assets/fonts/RobotoMono/LICENSE.txt similarity index 100% rename from js/assets/fonts/RobotoMono/LICENSE.txt rename to js-old/assets/fonts/RobotoMono/LICENSE.txt diff --git a/js/assets/fonts/RobotoMono/font.css b/js-old/assets/fonts/RobotoMono/font.css similarity index 100% rename from js/assets/fonts/RobotoMono/font.css rename to js-old/assets/fonts/RobotoMono/font.css diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Bold.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-BoldItalic.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Italic.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Light.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-LightItalic.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Medium.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-MediumItalic.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Regular.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-Thin.ttf diff --git a/js/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf b/js-old/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf similarity index 100% rename from js/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf rename to js-old/assets/fonts/RobotoMono/ttf/RobotoMono-ThinItalic.ttf diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz-pRBTtN4E2_qSPBnw6AgMc.woff2 diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz0ExlR2MysFCBK8OirNw2kM.woff2 diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2MSHb9EAJwuSzGfuRChQzQ.woff2 diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz2dsm03krrxlabhmVQFB99s.woff2 diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9Dnm4qiMZlH5rhYv_7LI2Y.woff2 diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59Fz9TIkQYohD4BpHvJ3NvbHoA.woff2 diff --git a/js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2 b/js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2 similarity index 100% rename from js/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2 rename to js-old/assets/fonts/RobotoMono/v4/N4duVc9C58uwPiY8_59FzyJ0caWjaSBdV-xZbEgst_k.woff2 diff --git a/js/assets/images/certifications/unknown.svg b/js-old/assets/images/certifications/unknown.svg similarity index 100% rename from js/assets/images/certifications/unknown.svg rename to js-old/assets/images/certifications/unknown.svg diff --git a/js/assets/images/contracts/ethereum-black-64x64.png b/js-old/assets/images/contracts/ethereum-black-64x64.png similarity index 100% rename from js/assets/images/contracts/ethereum-black-64x64.png rename to js-old/assets/images/contracts/ethereum-black-64x64.png diff --git a/js/assets/images/contracts/ethereum-black.png b/js-old/assets/images/contracts/ethereum-black.png similarity index 100% rename from js/assets/images/contracts/ethereum-black.png rename to js-old/assets/images/contracts/ethereum-black.png diff --git a/js/assets/images/contracts/ethereum-white.png b/js-old/assets/images/contracts/ethereum-white.png similarity index 100% rename from js/assets/images/contracts/ethereum-white.png rename to js-old/assets/images/contracts/ethereum-white.png diff --git a/js/assets/images/contracts/unknown-64x64.png b/js-old/assets/images/contracts/unknown-64x64.png similarity index 100% rename from js/assets/images/contracts/unknown-64x64.png rename to js-old/assets/images/contracts/unknown-64x64.png diff --git a/js/assets/images/contracts/unknown.png b/js-old/assets/images/contracts/unknown.png similarity index 100% rename from js/assets/images/contracts/unknown.png rename to js-old/assets/images/contracts/unknown.png diff --git a/js/assets/images/dapps/blocks-350.jpg b/js-old/assets/images/dapps/blocks-350.jpg similarity index 100% rename from js/assets/images/dapps/blocks-350.jpg rename to js-old/assets/images/dapps/blocks-350.jpg diff --git a/js/assets/images/dapps/close.svg b/js-old/assets/images/dapps/close.svg similarity index 100% rename from js/assets/images/dapps/close.svg rename to js-old/assets/images/dapps/close.svg diff --git a/js/assets/images/dapps/plus.svg b/js-old/assets/images/dapps/plus.svg similarity index 100% rename from js/assets/images/dapps/plus.svg rename to js-old/assets/images/dapps/plus.svg diff --git a/js/assets/images/dapps/signature.png b/js-old/assets/images/dapps/signature.png similarity index 100% rename from js/assets/images/dapps/signature.png rename to js-old/assets/images/dapps/signature.png diff --git a/js/assets/images/parity-logo-black-no-text.ico b/js-old/assets/images/parity-logo-black-no-text.ico similarity index 100% rename from js/assets/images/parity-logo-black-no-text.ico rename to js-old/assets/images/parity-logo-black-no-text.ico diff --git a/js/assets/images/parity-logo-black-no-text.png b/js-old/assets/images/parity-logo-black-no-text.png similarity index 100% rename from js/assets/images/parity-logo-black-no-text.png rename to js-old/assets/images/parity-logo-black-no-text.png diff --git a/js/assets/images/parity-logo-black-no-text.svg b/js-old/assets/images/parity-logo-black-no-text.svg similarity index 100% rename from js/assets/images/parity-logo-black-no-text.svg rename to js-old/assets/images/parity-logo-black-no-text.svg diff --git a/js/assets/images/parity-logo-black.svg b/js-old/assets/images/parity-logo-black.svg similarity index 100% rename from js/assets/images/parity-logo-black.svg rename to js-old/assets/images/parity-logo-black.svg diff --git a/js/assets/images/parity-logo-white-no-text.svg b/js-old/assets/images/parity-logo-white-no-text.svg similarity index 100% rename from js/assets/images/parity-logo-white-no-text.svg rename to js-old/assets/images/parity-logo-white-no-text.svg diff --git a/js/assets/images/parity-logo-white.svg b/js-old/assets/images/parity-logo-white.svg similarity index 100% rename from js/assets/images/parity-logo-white.svg rename to js-old/assets/images/parity-logo-white.svg diff --git a/js/assets/images/paritybar.png b/js-old/assets/images/paritybar.png similarity index 100% rename from js/assets/images/paritybar.png rename to js-old/assets/images/paritybar.png diff --git a/js/assets/images/shapeshift-btn.png b/js-old/assets/images/shapeshift-btn.png similarity index 100% rename from js/assets/images/shapeshift-btn.png rename to js-old/assets/images/shapeshift-btn.png diff --git a/js/assets/images/shapeshift-logo.png b/js-old/assets/images/shapeshift-logo.png similarity index 100% rename from js/assets/images/shapeshift-logo.png rename to js-old/assets/images/shapeshift-logo.png diff --git a/stratum/build.rs b/js-old/build.rs similarity index 84% rename from stratum/build.rs rename to js-old/build.rs index bad927dc133a57b61833b86e1543d0c6508910c3..a9a5ba8a6924ba4e3432829512fc1831de0ddfcf 100644 --- a/stratum/build.rs +++ b/js-old/build.rs @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -extern crate ethcore_ipc_codegen; +extern crate parity_dapps_glue; fn main() { - ethcore_ipc_codegen::derive_ipc("src/traits.rs").unwrap(); + parity_dapps_glue::js::build(env!("CARGO_MANIFEST_DIR"), "build"); + parity_dapps_glue::generate(); } diff --git a/js/npm/etherscan/README.md b/js-old/npm/etherscan/README.md similarity index 100% rename from js/npm/etherscan/README.md rename to js-old/npm/etherscan/README.md diff --git a/js/npm/etherscan/package.json b/js-old/npm/etherscan/package.json similarity index 100% rename from js/npm/etherscan/package.json rename to js-old/npm/etherscan/package.json diff --git a/js/npm/jsonrpc/README.md b/js-old/npm/jsonrpc/README.md similarity index 100% rename from js/npm/jsonrpc/README.md rename to js-old/npm/jsonrpc/README.md diff --git a/js/npm/jsonrpc/package.json b/js-old/npm/jsonrpc/package.json similarity index 100% rename from js/npm/jsonrpc/package.json rename to js-old/npm/jsonrpc/package.json diff --git a/js/npm/parity/README.md b/js-old/npm/parity/README.md similarity index 100% rename from js/npm/parity/README.md rename to js-old/npm/parity/README.md diff --git a/js/npm/parity/package.json b/js-old/npm/parity/package.json similarity index 100% rename from js/npm/parity/package.json rename to js-old/npm/parity/package.json diff --git a/js/npm/parity/test/smoke.spec.js b/js-old/npm/parity/test/smoke.spec.js similarity index 100% rename from js/npm/parity/test/smoke.spec.js rename to js-old/npm/parity/test/smoke.spec.js diff --git a/js/npm/shapeshift/README.md b/js-old/npm/shapeshift/README.md similarity index 100% rename from js/npm/shapeshift/README.md rename to js-old/npm/shapeshift/README.md diff --git a/js/npm/shapeshift/package.json b/js-old/npm/shapeshift/package.json similarity index 100% rename from js/npm/shapeshift/package.json rename to js-old/npm/shapeshift/package.json diff --git a/js/npm/test/mocha.config.js b/js-old/npm/test/mocha.config.js similarity index 100% rename from js/npm/test/mocha.config.js rename to js-old/npm/test/mocha.config.js diff --git a/js/npm/test/mocha.opts b/js-old/npm/test/mocha.opts similarity index 100% rename from js/npm/test/mocha.opts rename to js-old/npm/test/mocha.opts diff --git a/js-old/package-lock.json b/js-old/package-lock.json new file mode 100644 index 0000000000000000000000000000000000000000..ddfb8e2af2386f980b2cef2530635eb85b88af2a --- /dev/null +++ b/js-old/package-lock.json @@ -0,0 +1,13048 @@ +{ + "name": "parity.js", + "version": "1.8.18", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@parity/wordlist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@parity/wordlist/-/wordlist-1.0.1.tgz", + "integrity": "sha1-wn5A4as2OKCe1TtKLoHVMbXrWjE=" + }, + "JSONStream": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz", + "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=", + "dev": true, + "requires": { + "jsonparse": "0.0.5", + "through": "2.3.8" + } + }, + "abab": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz", + "integrity": "sha1-uB3l9ydOxOdW15fNg08wNkJyTl0=", + "dev": true + }, + "abbrev": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.0.tgz", + "integrity": "sha1-0FVMIlZjbi9W58LlrRg/hZQo2B8=" + }, + "accepts": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz", + "integrity": "sha1-w8p0NJOGSMPg2cHjKN1otiLChMo=", + "dev": true, + "requires": { + "mime-types": "2.1.16", + "negotiator": "0.6.1" + } + }, + "acorn": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.1.tgz", + "integrity": "sha512-vOk6uEMctu0vQrvuSqFdJyqj1Q0S5VTDL79qtjo+DhRr+1mmaD+tluFSCZqhvi/JUhXSzoZN2BhtstaPEeE8cw==", + "dev": true + }, + "acorn-dynamic-import": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", + "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", + "dev": true, + "requires": { + "acorn": "4.0.13" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + } + } + }, + "acorn-globals": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz", + "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=", + "dev": true, + "requires": { + "acorn": "4.0.13" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + } + } + }, + "acorn-jsx": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz", + "integrity": "sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=", + "dev": true, + "requires": { + "acorn": "3.3.0" + }, + "dependencies": { + "acorn": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz", + "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo=", + "dev": true + } + } + }, + "ajv": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.2.2.tgz", + "integrity": "sha1-R8aNaehvXZUxA7AHSpQw3GPaXjk=", + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "json-schema-traverse": "0.3.1", + "json-stable-stringify": "1.0.1" + }, + "dependencies": { + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + } + } + }, + "ajv-keywords": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz", + "integrity": "sha1-MU3QpLM2j609/NxU7eYXG4htrzw=", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", + "requires": { + "kind-of": "3.2.2", + "longest": "1.0.1", + "repeat-string": "1.6.1" + } + }, + "alphanum-sort": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", + "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", + "dev": true + }, + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", + "dev": true + }, + "ansi": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz", + "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE=" + }, + "ansi-escapes": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-2.0.0.tgz", + "integrity": "sha1-W65SvkJIeN2Xg+iRDj/Cki6DyBs=" + }, + "ansi-html": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", + "dev": true + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" + }, + "any-promise": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-0.1.0.tgz", + "integrity": "sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=", + "dev": true + }, + "anymatch": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz", + "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==", + "dev": true, + "requires": { + "micromatch": "2.3.11", + "normalize-path": "2.1.1" + } + }, + "append-transform": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-0.4.0.tgz", + "integrity": "sha1-126/jKlNJ24keja61EpLdKthGZE=", + "dev": true, + "requires": { + "default-require-extensions": "1.0.0" + } + }, + "aproba": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.1.2.tgz", + "integrity": "sha512-ZpYajIfO0j2cOFTO955KUMIKNmj6zhX8kVztMAxFsDaMwz+9Z9SV0uou2pC9HJqcfpffOsjnbrDMvkNy+9RXPw==" + }, + "archive-type": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/archive-type/-/archive-type-3.2.0.tgz", + "integrity": "sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=", + "requires": { + "file-type": "3.9.0" + } + }, + "are-we-there-yet": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz", + "integrity": "sha1-u13KOCu5TwXhUZQ3PRb9O6HKEQ0=", + "requires": { + "delegates": "1.0.0", + "readable-stream": "2.3.3" + } + }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "requires": { + "arr-flatten": "1.1.0" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" + }, + "array-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", + "dev": true + }, + "array-find-index": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", + "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=" + }, + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=" + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=" + }, + "array.prototype.find": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.0.4.tgz", + "integrity": "sha1-VWpcU2LAhkgyPdrrnenRS8GGTJA=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.7.0" + } + }, + "arraybuffer-loader": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/arraybuffer-loader/-/arraybuffer-loader-0.2.2.tgz", + "integrity": "sha1-jnKU0VGqyO1wqC53Pq0FWQ23Dik=", + "requires": { + "loader-utils": "0.2.17" + } + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=" + }, + "asn1.js": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.9.1.tgz", + "integrity": "sha1-SLokC0WpKA6UdImQull9IWYX/UA=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0" + } + }, + "assert": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", + "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", + "dev": true, + "requires": { + "util": "0.10.3" + } + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=" + }, + "assertion-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.0.2.tgz", + "integrity": "sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=", + "dev": true + }, + "ast-types": { + "version": "0.9.6", + "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.9.6.tgz", + "integrity": "sha1-ECyenpAF0+fjgpvwxPok7oYu6bk=", + "dev": true + }, + "async": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", + "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", + "dev": true + }, + "async-each": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", + "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", + "dev": true + }, + "async-each-series": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/async-each-series/-/async-each-series-1.1.0.tgz", + "integrity": "sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "attr-accept": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/attr-accept/-/attr-accept-1.1.0.tgz", + "integrity": "sha1-tc01In8WOTWo8d4Q7T66FpQfa+Y=" + }, + "autoprefixer": { + "version": "6.7.7", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", + "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000708", + "normalize-range": "0.1.2", + "num2fraction": "1.2.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=" + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=" + }, + "babel-cli": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-cli/-/babel-cli-6.23.0.tgz", + "integrity": "sha1-Uv+UaisPZGRcNee9XuomeqCUjA8=", + "dev": true, + "requires": { + "babel-core": "6.23.1", + "babel-polyfill": "6.23.0", + "babel-register": "6.23.0", + "babel-runtime": "6.23.0", + "chokidar": "1.7.0", + "commander": "2.8.1", + "convert-source-map": "1.5.0", + "fs-readdir-recursive": "1.0.0", + "glob": "7.1.2", + "lodash": "4.17.2", + "output-file-sync": "1.1.2", + "path-is-absolute": "1.0.1", + "slash": "1.0.0", + "source-map": "0.5.6", + "v8flags": "2.1.1" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "babel-code-frame": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.22.0.tgz", + "integrity": "sha1-AnYgvuVnqIwyVhV05/0IAdMxGOQ=", + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, + "babel-core": { + "version": "6.23.1", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.23.1.tgz", + "integrity": "sha1-wUPLYhuy9iFxDCIMXVedFbikQt8=", + "dev": true, + "requires": { + "babel-code-frame": "6.22.0", + "babel-generator": "6.25.0", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.23.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "babylon": "6.17.4", + "convert-source-map": "1.5.0", + "debug": "2.6.8", + "json5": "0.5.1", + "lodash": "4.17.2", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.7", + "slash": "1.0.0", + "source-map": "0.5.6" + } + }, + "babel-eslint": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-7.1.1.tgz", + "integrity": "sha1-imqITwhapwYK9pz8dzQcL5k3D7I=", + "dev": true, + "requires": { + "babel-code-frame": "6.22.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "babylon": "6.17.4", + "lodash.pickby": "4.6.0" + } + }, + "babel-generator": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.25.0.tgz", + "integrity": "sha1-M6GvcNXyiQrrRlpKd5PB32qeqfw=", + "requires": { + "babel-messages": "6.23.0", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0", + "detect-indent": "4.0.0", + "jsesc": "1.3.0", + "lodash": "4.17.2", + "source-map": "0.5.6", + "trim-right": "1.0.1" + }, + "dependencies": { + "jsesc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" + } + } + }, + "babel-helper-bindify-decorators": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz", + "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-builder-binary-assignment-operator-visitor": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", + "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", + "dev": true, + "requires": { + "babel-helper-explode-assignable-expression": "6.24.1", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-builder-react-jsx": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.24.1.tgz", + "integrity": "sha1-CteRfjPI11HmRtrKTnfMGTd9LLw=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0", + "esutils": "2.0.2" + } + }, + "babel-helper-call-delegate": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", + "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", + "requires": { + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.23.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-define-map": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.24.1.tgz", + "integrity": "sha1-epdH8ljYlH0y1RX2qhx70CIEoIA=", + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0", + "lodash": "4.17.2" + } + }, + "babel-helper-explode-assignable-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", + "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-explode-class": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz", + "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", + "dev": true, + "requires": { + "babel-helper-bindify-decorators": "6.24.1", + "babel-runtime": "6.23.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", + "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", + "requires": { + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-get-function-arity": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", + "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-hoist-variables": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", + "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-optimise-call-expression": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", + "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.24.1.tgz", + "integrity": "sha1-024i+rEAjXnYhkjjIRaGgShFbOg=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0", + "lodash": "4.17.2" + } + }, + "babel-helper-remap-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", + "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helper-replace-supers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", + "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", + "requires": { + "babel-helper-optimise-call-expression": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-helpers": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", + "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", + "requires": { + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-loader": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-6.3.2.tgz", + "integrity": "sha1-GN5FZjhVeMG0+P/my8Zo9eKl7wM=", + "dev": true, + "requires": { + "find-cache-dir": "0.1.1", + "loader-utils": "0.2.17", + "mkdirp": "0.5.1", + "object-assign": "4.1.1" + } + }, + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-check-es2015-constants": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", + "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-lodash": { + "version": "3.2.11", + "resolved": "https://registry.npmjs.org/babel-plugin-lodash/-/babel-plugin-lodash-3.2.11.tgz", + "integrity": "sha1-Icj97J/hg176pzeHPjkCvdZtVwE=", + "dev": true, + "requires": { + "glob": "7.1.2", + "lodash": "4.17.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "babel-plugin-react-intl": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/babel-plugin-react-intl/-/babel-plugin-react-intl-2.3.1.tgz", + "integrity": "sha1-PUORLoJNoAXgjo6COdW6eEN0uwA=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0", + "intl-messageformat-parser": "1.2.0", + "mkdirp": "0.5.1" + } + }, + "babel-plugin-recharts": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/babel-plugin-recharts/-/babel-plugin-recharts-1.1.0.tgz", + "integrity": "sha1-gSzISxPrWN1AWyxjoo6m97JqtKc=", + "dev": true, + "requires": { + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "babylon": "6.17.4" + } + }, + "babel-plugin-syntax-async-functions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", + "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", + "dev": true + }, + "babel-plugin-syntax-async-generators": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz", + "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", + "dev": true + }, + "babel-plugin-syntax-class-constructor-call": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-constructor-call/-/babel-plugin-syntax-class-constructor-call-6.18.0.tgz", + "integrity": "sha1-nLnTn+Q8hgC+yBRkVt3L1OGnZBY=", + "dev": true + }, + "babel-plugin-syntax-class-properties": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz", + "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=", + "dev": true + }, + "babel-plugin-syntax-decorators": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz", + "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=", + "dev": true + }, + "babel-plugin-syntax-do-expressions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-do-expressions/-/babel-plugin-syntax-do-expressions-6.13.0.tgz", + "integrity": "sha1-V0d1YTmqJtOQ0JQQsDdEugfkeW0=", + "dev": true + }, + "babel-plugin-syntax-dynamic-import": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", + "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", + "dev": true + }, + "babel-plugin-syntax-exponentiation-operator": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", + "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", + "dev": true + }, + "babel-plugin-syntax-export-extensions": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-export-extensions/-/babel-plugin-syntax-export-extensions-6.13.0.tgz", + "integrity": "sha1-cKFITw+QiaToStRLrDU8lbmxJyE=", + "dev": true + }, + "babel-plugin-syntax-flow": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz", + "integrity": "sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=", + "dev": true + }, + "babel-plugin-syntax-function-bind": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-function-bind/-/babel-plugin-syntax-function-bind-6.13.0.tgz", + "integrity": "sha1-SMSV8Xe98xqYHnMvVa3AvdJgH0Y=", + "dev": true + }, + "babel-plugin-syntax-jsx": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", + "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=", + "dev": true + }, + "babel-plugin-syntax-object-rest-spread": { + "version": "6.13.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", + "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", + "dev": true + }, + "babel-plugin-syntax-trailing-function-commas": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", + "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", + "dev": true + }, + "babel-plugin-transform-async-generator-functions": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz", + "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-generators": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-async-to-generator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", + "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", + "dev": true, + "requires": { + "babel-helper-remap-async-to-generator": "6.24.1", + "babel-plugin-syntax-async-functions": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-class-constructor-call": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-constructor-call/-/babel-plugin-transform-class-constructor-call-6.24.1.tgz", + "integrity": "sha1-gNwoVQWsBn3LjWxl4vbxGrd2Xvk=", + "dev": true, + "requires": { + "babel-plugin-syntax-class-constructor-call": "6.18.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-class-properties": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.23.0.tgz", + "integrity": "sha1-GHt0fuQEOZATVjyZPbA480dUrDs=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-plugin-syntax-class-properties": "6.13.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-decorators": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz", + "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", + "dev": true, + "requires": { + "babel-helper-explode-class": "6.24.1", + "babel-plugin-syntax-decorators": "6.13.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-decorators-legacy": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.4.tgz", + "integrity": "sha1-dBtY9sW86eYCfgiC2cmU8E82aSU=", + "dev": true, + "requires": { + "babel-plugin-syntax-decorators": "6.13.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-do-expressions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-do-expressions/-/babel-plugin-transform-do-expressions-6.22.0.tgz", + "integrity": "sha1-KMyvkoEtlJws0SgfaQyP3EaK6bs=", + "dev": true, + "requires": { + "babel-plugin-syntax-do-expressions": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-arrow-functions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", + "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-block-scoped-functions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", + "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-block-scoping": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.24.1.tgz", + "integrity": "sha1-dsKV3DpHQbFmWt/TFnIV3P8ypXY=", + "requires": { + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "lodash": "4.17.2" + } + }, + "babel-plugin-transform-es2015-classes": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", + "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", + "requires": { + "babel-helper-define-map": "6.24.1", + "babel-helper-function-name": "6.24.1", + "babel-helper-optimise-call-expression": "6.24.1", + "babel-helper-replace-supers": "6.24.1", + "babel-messages": "6.23.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-computed-properties": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", + "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", + "requires": { + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-es2015-destructuring": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", + "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-duplicate-keys": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", + "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-for-of": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", + "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-function-name": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", + "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-literals": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", + "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-modules-amd": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", + "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", + "requires": { + "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-es2015-modules-commonjs": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.24.1.tgz", + "integrity": "sha1-0+MQtA72ZKNmIiAAl8bUQCmPK/4=", + "requires": { + "babel-plugin-transform-strict-mode": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-modules-systemjs": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", + "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", + "requires": { + "babel-helper-hoist-variables": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-es2015-modules-umd": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", + "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", + "requires": { + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + }, + "babel-plugin-transform-es2015-object-super": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", + "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", + "requires": { + "babel-helper-replace-supers": "6.24.1", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-parameters": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", + "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", + "requires": { + "babel-helper-call-delegate": "6.24.1", + "babel-helper-get-function-arity": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-shorthand-properties": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", + "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-spread": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", + "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-sticky-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", + "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", + "requires": { + "babel-helper-regex": "6.24.1", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-transform-es2015-template-literals": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", + "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-typeof-symbol": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", + "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-es2015-unicode-regex": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", + "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", + "requires": { + "babel-helper-regex": "6.24.1", + "babel-runtime": "6.23.0", + "regexpu-core": "2.0.0" + } + }, + "babel-plugin-transform-exponentiation-operator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", + "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", + "dev": true, + "requires": { + "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", + "babel-plugin-syntax-exponentiation-operator": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-export-extensions": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-export-extensions/-/babel-plugin-transform-export-extensions-6.22.0.tgz", + "integrity": "sha1-U3OLR+deghhYnuqUbLvTkQm75lM=", + "dev": true, + "requires": { + "babel-plugin-syntax-export-extensions": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-flow-strip-types": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz", + "integrity": "sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=", + "dev": true, + "requires": { + "babel-plugin-syntax-flow": "6.18.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-function-bind": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-function-bind/-/babel-plugin-transform-function-bind-6.22.0.tgz", + "integrity": "sha1-xvuOlqwpajELjPjqQBRiQH3fapc=", + "dev": true, + "requires": { + "babel-plugin-syntax-function-bind": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-object-rest-spread": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.23.0.tgz", + "integrity": "sha1-h11ryb52HFiirj/u5dxIldjH+SE=", + "dev": true, + "requires": { + "babel-plugin-syntax-object-rest-spread": "6.13.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-react-display-name": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz", + "integrity": "sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-react-jsx": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz", + "integrity": "sha1-hAoCjn30YN/DotKfDA2R9jduZqM=", + "dev": true, + "requires": { + "babel-helper-builder-react-jsx": "6.24.1", + "babel-plugin-syntax-jsx": "6.18.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-react-jsx-self": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz", + "integrity": "sha1-322AqdomEqEh5t3XVYvL7PBuY24=", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-react-jsx-source": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz", + "integrity": "sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-react-remove-prop-types": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.3.2.tgz", + "integrity": "sha1-bajYNMbXrYqwL5VlCXkM+qAf/hk=", + "dev": true + }, + "babel-plugin-transform-regenerator": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.24.1.tgz", + "integrity": "sha1-uNowWtQ8PJm0hI5P5AN7dw0jxBg=", + "requires": { + "regenerator-transform": "0.9.11" + } + }, + "babel-plugin-transform-runtime": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", + "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0" + } + }, + "babel-plugin-transform-strict-mode": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", + "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0" + } + }, + "babel-plugin-webpack-alias": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/babel-plugin-webpack-alias/-/babel-plugin-webpack-alias-2.1.2.tgz", + "integrity": "sha1-BaG6I8KFlWYPtupXNkJPxZa0okc=", + "dev": true, + "requires": { + "babel-types": "6.25.0", + "find-up": "2.1.0", + "lodash.some": "4.6.0", + "lodash.template": "4.4.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "2.0.0" + } + }, + "lodash.template": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.4.0.tgz", + "integrity": "sha1-5zoDhcg1VZF0bgILmWecaQ5o+6A=", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.templatesettings": "4.1.0" + } + }, + "lodash.templatesettings": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.1.0.tgz", + "integrity": "sha1-K01OlbpEDZFf8IvImeRVNmZxMxY=", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0" + } + } + } + }, + "babel-polyfill": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-polyfill/-/babel-polyfill-6.23.0.tgz", + "integrity": "sha1-g2TKYt+Or7gwSZ9pkXdGbDsDSZ0=", + "dev": true, + "requires": { + "babel-runtime": "6.23.0", + "core-js": "2.4.1", + "regenerator-runtime": "0.10.5" + } + }, + "babel-preset-env": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.1.9.tgz", + "integrity": "sha1-SUQ9zW71K0i3GR6jOGniRZCp60o=", + "dev": true, + "requires": { + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.24.1", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-regenerator": "6.24.1", + "browserslist": "1.7.7", + "electron-to-chromium": "1.3.16", + "invariant": "2.2.2" + } + }, + "babel-preset-es2015": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.22.0.tgz", + "integrity": "sha1-r1qY7LNeuK92StiloF6zbcQ4aDU=", + "dev": true, + "requires": { + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.24.1", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-regenerator": "6.24.1" + } + }, + "babel-preset-es2016": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-preset-es2016/-/babel-preset-es2016-6.22.0.tgz", + "integrity": "sha1-sGGqo5g9QMn7rPo3Q7XfN/M2FWw=", + "dev": true, + "requires": { + "babel-plugin-transform-exponentiation-operator": "6.24.1" + } + }, + "babel-preset-es2017": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-preset-es2017/-/babel-preset-es2017-6.22.0.tgz", + "integrity": "sha1-3i+dpaMMUNKT+1SguhXW3cVz8PI=", + "dev": true, + "requires": { + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-to-generator": "6.24.1" + } + }, + "babel-preset-flow": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz", + "integrity": "sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=", + "dev": true, + "requires": { + "babel-plugin-transform-flow-strip-types": "6.22.0" + } + }, + "babel-preset-react": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-preset-react/-/babel-preset-react-6.23.0.tgz", + "integrity": "sha1-63zuTemKP5RQLChWUzLamBlFUZU=", + "dev": true, + "requires": { + "babel-plugin-syntax-jsx": "6.18.0", + "babel-plugin-transform-react-display-name": "6.25.0", + "babel-plugin-transform-react-jsx": "6.24.1", + "babel-plugin-transform-react-jsx-self": "6.22.0", + "babel-plugin-transform-react-jsx-source": "6.22.0", + "babel-preset-flow": "6.23.0" + } + }, + "babel-preset-stage-0": { + "version": "6.22.0", + "resolved": "https://registry.npmjs.org/babel-preset-stage-0/-/babel-preset-stage-0-6.22.0.tgz", + "integrity": "sha1-cH7rW0Fdp2nv+cQvRUf2RPkpbvk=", + "dev": true, + "requires": { + "babel-plugin-transform-do-expressions": "6.22.0", + "babel-plugin-transform-function-bind": "6.22.0", + "babel-preset-stage-1": "6.24.1" + } + }, + "babel-preset-stage-1": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz", + "integrity": "sha1-dpLNfc1oSZB+auSgqFWJz7niv7A=", + "dev": true, + "requires": { + "babel-plugin-transform-class-constructor-call": "6.24.1", + "babel-plugin-transform-export-extensions": "6.22.0", + "babel-preset-stage-2": "6.24.1" + } + }, + "babel-preset-stage-2": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz", + "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", + "dev": true, + "requires": { + "babel-plugin-syntax-dynamic-import": "6.18.0", + "babel-plugin-transform-class-properties": "6.24.1", + "babel-plugin-transform-decorators": "6.24.1", + "babel-preset-stage-3": "6.24.1" + }, + "dependencies": { + "babel-plugin-transform-class-properties": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz", + "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", + "dev": true, + "requires": { + "babel-helper-function-name": "6.24.1", + "babel-plugin-syntax-class-properties": "6.13.0", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0" + } + } + } + }, + "babel-preset-stage-3": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz", + "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", + "dev": true, + "requires": { + "babel-plugin-syntax-trailing-function-commas": "6.22.0", + "babel-plugin-transform-async-generator-functions": "6.24.1", + "babel-plugin-transform-async-to-generator": "6.24.1", + "babel-plugin-transform-exponentiation-operator": "6.24.1", + "babel-plugin-transform-object-rest-spread": "6.23.0" + } + }, + "babel-register": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.23.0.tgz", + "integrity": "sha1-yao9TMqUtR2jSCbEoPnggUXXT/M=", + "dev": true, + "requires": { + "babel-core": "6.23.1", + "babel-runtime": "6.23.0", + "core-js": "2.4.1", + "home-or-tmp": "2.0.0", + "lodash": "4.17.2", + "mkdirp": "0.5.1", + "source-map-support": "0.4.15" + } + }, + "babel-runtime": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.23.0.tgz", + "integrity": "sha1-CpSJ8UTecO+zzkMArM2zKeL8VDs=", + "requires": { + "core-js": "2.4.1", + "regenerator-runtime": "0.10.5" + } + }, + "babel-template": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.25.0.tgz", + "integrity": "sha1-ZlJBFmt8KqTGGdceGSlpVSsQwHE=", + "requires": { + "babel-runtime": "6.23.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "babylon": "6.17.4", + "lodash": "4.17.2" + } + }, + "babel-traverse": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.25.0.tgz", + "integrity": "sha1-IldJfi/NGbie3BPEyROB+VEklvE=", + "requires": { + "babel-code-frame": "6.22.0", + "babel-messages": "6.23.0", + "babel-runtime": "6.23.0", + "babel-types": "6.25.0", + "babylon": "6.17.4", + "debug": "2.6.8", + "globals": "9.18.0", + "invariant": "2.2.2", + "lodash": "4.17.2" + } + }, + "babel-types": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.25.0.tgz", + "integrity": "sha1-cK+ySNVmDl0Y+BHZHIMDtUE0oY4=", + "requires": { + "babel-runtime": "6.23.0", + "esutils": "2.0.2", + "lodash": "4.17.2", + "to-fast-properties": "1.0.3" + } + }, + "babelify": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/babelify/-/babelify-7.3.0.tgz", + "integrity": "sha1-qlau3nBn/XvVSWZu4W3ChQh+iOU=", + "requires": { + "babel-core": "6.25.0", + "object-assign": "4.1.1" + }, + "dependencies": { + "babel-core": { + "version": "6.25.0", + "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.25.0.tgz", + "integrity": "sha1-fdQrBGPHQunVKW3rPsZ6kyLa1yk=", + "requires": { + "babel-code-frame": "6.22.0", + "babel-generator": "6.25.0", + "babel-helpers": "6.24.1", + "babel-messages": "6.23.0", + "babel-register": "6.24.1", + "babel-runtime": "6.23.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "babylon": "6.17.4", + "convert-source-map": "1.5.0", + "debug": "2.6.8", + "json5": "0.5.1", + "lodash": "4.17.2", + "minimatch": "3.0.4", + "path-is-absolute": "1.0.1", + "private": "0.1.7", + "slash": "1.0.0", + "source-map": "0.5.6" + } + }, + "babel-register": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.24.1.tgz", + "integrity": "sha1-fhDhOi9xBlvfrVoXh7pFvKbe118=", + "requires": { + "babel-core": "6.25.0", + "babel-runtime": "6.23.0", + "core-js": "2.4.1", + "home-or-tmp": "2.0.0", + "lodash": "4.17.2", + "mkdirp": "0.5.1", + "source-map-support": "0.4.15" + } + } + } + }, + "babylon": { + "version": "6.17.4", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.17.4.tgz", + "integrity": "sha512-kChlV+0SXkjE0vUn9OZ7pBMWRFd8uq3mZe8x1K6jhuNcAFAtEnjchFAqB+dYEXKyd+JpT6eppRR78QAr5gTsUw==" + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base32.js": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/base32.js/-/base32.js-0.1.0.tgz", + "integrity": "sha1-tYLexpPC8R6JPPBk7mrFthMaIgI=" + }, + "base64-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz", + "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==", + "dev": true + }, + "batch-processor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz", + "integrity": "sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=" + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=" + }, + "big.js": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.1.3.tgz", + "integrity": "sha1-TK2iGTZS6zyp7I5VyQFWacmAaXg=" + }, + "bignumber.js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-3.0.1.tgz", + "integrity": "sha1-gHZS0Q453jfp40lyR+3HmLt0b3Y=" + }, + "bin-build": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/bin-build/-/bin-build-2.2.0.tgz", + "integrity": "sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=", + "dev": true, + "requires": { + "archive-type": "3.2.0", + "decompress": "3.0.0", + "download": "4.4.3", + "exec-series": "1.0.3", + "rimraf": "2.6.1", + "tempfile": "1.1.1", + "url-regex": "3.2.0" + }, + "dependencies": { + "tempfile": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-1.1.1.tgz", + "integrity": "sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=", + "dev": true, + "requires": { + "os-tmpdir": "1.0.2", + "uuid": "2.0.3" + } + }, + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + } + } + }, + "bin-check": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/bin-check/-/bin-check-2.0.0.tgz", + "integrity": "sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=", + "dev": true, + "requires": { + "executable": "1.1.0" + } + }, + "bin-version": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/bin-version/-/bin-version-1.0.4.tgz", + "integrity": "sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=", + "dev": true, + "requires": { + "find-versions": "1.2.1" + } + }, + "bin-version-check": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/bin-version-check/-/bin-version-check-2.1.0.tgz", + "integrity": "sha1-5OXfKQuQaffRETJAMe/BP90RpbA=", + "dev": true, + "requires": { + "bin-version": "1.0.4", + "minimist": "1.2.0", + "semver": "4.3.6", + "semver-truncate": "1.1.2" + }, + "dependencies": { + "semver": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz", + "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=", + "dev": true + } + } + }, + "bin-wrapper": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/bin-wrapper/-/bin-wrapper-3.0.2.tgz", + "integrity": "sha1-Z9MwYmLksaXy+I7iNGT2plVneus=", + "dev": true, + "requires": { + "bin-check": "2.0.0", + "bin-version-check": "2.1.0", + "download": "4.4.3", + "each-async": "1.1.1", + "lazy-req": "1.1.0", + "os-filter-obj": "1.0.3" + } + }, + "binary-extensions": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.9.0.tgz", + "integrity": "sha1-ZlBsFs5vTWkopbPNajPKQelB43s=", + "dev": true + }, + "bindings": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.0.tgz", + "integrity": "sha512-DpLh5EzMR2kzvX1KIlVC0VkC3iZtHKTgdtZ0a3pglBZdaQFjt5S9g9xd1lE+YvXyfd6mtCeRnrUfOLYiTMlNSw==" + }, + "bip66": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/bip66/-/bip66-1.1.5.tgz", + "integrity": "sha1-AfqHSHhcpwlV1QESF9GzE5lpyiI=", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "bl": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.1.tgz", + "integrity": "sha1-ysMo977kVzDUBLaSID/LWQ4XLV4=", + "requires": { + "readable-stream": "2.3.3" + } + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "requires": { + "inherits": "2.0.3" + } + }, + "blockies": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/blockies/-/blockies-0.0.2.tgz", + "integrity": "sha1-Iq1Y2k9rOCvHm/Q4bFggxwBH5O0=" + }, + "bluebird": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.11.0.tgz", + "integrity": "sha1-U0uQM8AiyVecVro7Plpcqvu2UOE=", + "dev": true + }, + "bn.js": { + "version": "4.11.7", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.7.tgz", + "integrity": "sha512-LxFiV5mefv0ley0SzqkOPR1bC4EbpPx8LkOz5vMe/Yi15t5hzwgO/G+tc7wOtL4PZTYjwHu8JnEiSLumuSjSfA==" + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", + "dev": true + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "requires": { + "hoek": "2.16.3" + } + }, + "bowser": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-1.7.1.tgz", + "integrity": "sha1-pN6PGKGg3JUx6yqSoVIftqm6lqU=" + }, + "brace": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/brace/-/brace-0.9.0.tgz", + "integrity": "sha1-rQNLrmUiDrZ22UnLKAOD+o4S+nI=", + "requires": { + "w3c-blob": "0.0.1" + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=" + }, + "browser-stdout": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "dev": true + }, + "browserify-aes": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.6.tgz", + "integrity": "sha1-Xncl297x/Vkw1OurSFZ85FHEigo=", + "requires": { + "buffer-xor": "1.0.3", + "cipher-base": "1.0.4", + "create-hash": "1.1.3", + "evp_bytestokey": "1.0.0", + "inherits": "2.0.3" + } + }, + "browserify-cipher": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.0.tgz", + "integrity": "sha1-mYgkSHS/XtTijalWZtzWasj8Njo=", + "dev": true, + "requires": { + "browserify-aes": "1.0.6", + "browserify-des": "1.0.0", + "evp_bytestokey": "1.0.0" + } + }, + "browserify-des": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.0.tgz", + "integrity": "sha1-2qJ3cXRwki7S/hhZQRihdUOXId0=", + "dev": true, + "requires": { + "cipher-base": "1.0.4", + "des.js": "1.0.0", + "inherits": "2.0.3" + } + }, + "browserify-rsa": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "randombytes": "2.0.5" + } + }, + "browserify-sign": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "browserify-rsa": "4.0.1", + "create-hash": "1.1.3", + "create-hmac": "1.1.6", + "elliptic": "6.4.0", + "inherits": "2.0.3", + "parse-asn1": "5.1.0" + } + }, + "browserify-zlib": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz", + "integrity": "sha1-uzX4pRn2AOD6a4SFJByXnQFB+y0=", + "dev": true, + "requires": { + "pako": "0.2.9" + } + }, + "browserslist": { + "version": "1.7.7", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", + "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", + "dev": true, + "requires": { + "caniuse-db": "1.0.30000708", + "electron-to-chromium": "1.3.16" + } + }, + "buffer": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "dev": true, + "requires": { + "base64-js": "1.2.1", + "ieee754": "1.1.8", + "isarray": "1.0.0" + } + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=" + }, + "buffer-to-vinyl": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz", + "integrity": "sha1-APFfruOreh3aLN5tkSG//dB7ImI=", + "requires": { + "file-type": "3.9.0", + "readable-stream": "2.3.3", + "uuid": "2.0.3", + "vinyl": "1.2.0" + }, + "dependencies": { + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" + } + } + }, + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=" + }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=" + }, + "builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true + }, + "bytes": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz", + "integrity": "sha1-fZcZb51br39pNeJZhVSe3SpsIzk=" + }, + "caller-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz", + "integrity": "sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=", + "dev": true, + "requires": { + "callsites": "0.2.0" + } + }, + "callsites": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=", + "dev": true + }, + "camel-case": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", + "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", + "dev": true, + "requires": { + "no-case": "2.3.1", + "upper-case": "1.1.3" + } + }, + "camelcase": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", + "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=" + }, + "camelcase-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", + "requires": { + "camelcase": "2.1.1", + "map-obj": "1.0.1" + } + }, + "caniuse-api": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", + "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000708", + "lodash.memoize": "4.1.2", + "lodash.uniq": "4.5.0" + } + }, + "caniuse-db": { + "version": "1.0.30000708", + "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000708.tgz", + "integrity": "sha1-wuc2vTt/xfbBTkxt/mK5jtFeils=", + "dev": true + }, + "capture-stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + }, + "caw": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/caw/-/caw-1.2.0.tgz", + "integrity": "sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=", + "requires": { + "get-proxy": "1.1.0", + "is-obj": "1.0.1", + "object-assign": "3.0.0", + "tunnel-agent": "0.4.3" + }, + "dependencies": { + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=" + } + } + }, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "requires": { + "align-text": "0.1.4", + "lazy-cache": "1.0.4" + } + }, + "chai": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-3.5.0.tgz", + "integrity": "sha1-TQJjewZ/6Vi9v906QOxW/vc3Mkc=", + "dev": true, + "requires": { + "assertion-error": "1.0.2", + "deep-eql": "0.1.3", + "type-detect": "1.0.0" + } + }, + "chai-as-promised": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/chai-as-promised/-/chai-as-promised-6.0.0.tgz", + "integrity": "sha1-GgKkM6byTa+sY7nJb6FoTbGqjaY=", + "dev": true, + "requires": { + "check-error": "1.0.2" + } + }, + "chai-enzyme": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/chai-enzyme/-/chai-enzyme-0.6.1.tgz", + "integrity": "sha1-WFyWPG6hMxRG79Eu6DkegH11hiA=", + "dev": true, + "requires": { + "html": "1.0.0", + "react-element-to-jsx-string": "5.0.7" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "react-element-to-jsx-string": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-5.0.7.tgz", + "integrity": "sha1-xmOkgAqccSEVwNhRnLAhWkah8PI=", + "dev": true, + "requires": { + "collapse-white-space": "1.0.3", + "is-plain-object": "2.0.4", + "lodash": "4.17.4", + "sortobject": "1.1.1", + "stringify-object": "2.4.0", + "traverse": "0.6.6" + } + }, + "stringify-object": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-2.4.0.tgz", + "integrity": "sha1-xi0RAj6yH+LZsIe+A5om3zsioJ0=", + "dev": true, + "requires": { + "is-plain-obj": "1.1.0", + "is-regexp": "1.0.0" + } + } + } + }, + "chain-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/chain-function/-/chain-function-1.0.0.tgz", + "integrity": "sha1-DUqzfn4Y6tC9xHuSB2QRjOWHM9w=" + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "change-emitter": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/change-emitter/-/change-emitter-0.1.6.tgz", + "integrity": "sha1-6LL+PX8at9aaMhma/5HqaTFAlRU=" + }, + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "dev": true + }, + "cheerio": { + "version": "0.22.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-0.22.0.tgz", + "integrity": "sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=", + "dev": true, + "requires": { + "css-select": "1.2.0", + "dom-serializer": "0.1.0", + "entities": "1.1.1", + "htmlparser2": "3.9.2", + "lodash.assignin": "4.2.0", + "lodash.bind": "4.2.1", + "lodash.defaults": "4.2.0", + "lodash.filter": "4.6.0", + "lodash.flatten": "4.4.0", + "lodash.foreach": "4.5.0", + "lodash.map": "4.6.0", + "lodash.merge": "4.6.0", + "lodash.pick": "4.4.0", + "lodash.reduce": "4.6.0", + "lodash.reject": "4.6.0", + "lodash.some": "4.6.0" + } + }, + "chokidar": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz", + "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=", + "dev": true, + "requires": { + "anymatch": "1.3.2", + "async-each": "1.0.1", + "glob-parent": "2.0.0", + "inherits": "2.0.3", + "is-binary-path": "1.0.1", + "is-glob": "2.0.1", + "path-is-absolute": "1.0.1", + "readdirp": "2.1.0" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "chownr": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", + "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=" + }, + "ci-info": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.0.0.tgz", + "integrity": "sha1-3FKF8rTiUYIWg2gcOBwziPRuxTQ=" + }, + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "requires": { + "inherits": "2.0.3", + "safe-buffer": "5.1.1" + } + }, + "circular-dependency-plugin": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-2.0.0.tgz", + "integrity": "sha1-wQeWyDOQSIqbzdQvAy1uZOmE9mA=", + "dev": true + }, + "circular-json": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz", + "integrity": "sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==", + "dev": true + }, + "clap": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.0.tgz", + "integrity": "sha1-WckP4+E3EEdG/xlGmiemNP9oyFc=", + "dev": true, + "requires": { + "chalk": "1.1.3" + } + }, + "classnames": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.5.tgz", + "integrity": "sha1-+zgB1FNGdknvNgPH1hoCvRKb3m0=" + }, + "clean-css": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.7.tgz", + "integrity": "sha1-ua6k+FZ5iJzz6ui0A0nsTr390DI=", + "dev": true, + "requires": { + "source-map": "0.5.6" + } + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "requires": { + "restore-cursor": "2.0.0" + } + }, + "cli-width": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz", + "integrity": "sha1-sjTKIJsp72b8UY2bmNWEewDt8Ao=" + }, + "cliui": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", + "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wrap-ansi": "2.1.0" + } + }, + "clone": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.2.tgz", + "integrity": "sha1-Jgt6meux7f4kdTgXX3gyQ8sZ0Uk=" + }, + "clone-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-regexp/-/clone-regexp-1.0.0.tgz", + "integrity": "sha1-6uCiQT9VwJQvgYwin+/OhF1/Oxw=", + "dev": true, + "requires": { + "is-regexp": "1.0.0", + "is-supported-regexp-flag": "1.0.0" + } + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=" + }, + "cmd-shim": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-2.0.2.tgz", + "integrity": "sha1-b8vamUg6j9FdfTChlspp1oii79s=", + "requires": { + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1" + } + }, + "co": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/co/-/co-3.1.0.tgz", + "integrity": "sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=" + }, + "coa": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", + "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", + "dev": true, + "requires": { + "q": "1.5.0" + } + }, + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + }, + "codemirror": { + "version": "5.28.0", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.28.0.tgz", + "integrity": "sha512-E/Z6050shti9v9ivl0dUClVRM4xaH204jsJmEpNYC6KDTlQwAz+5DdhLzn0tjaL/Mp1P0J1uhZokcSP2RFSwlA==" + }, + "collapse-white-space": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.3.tgz", + "integrity": "sha1-S5BvZw5aljqHt2sOFolkM0G2Ajw=" + }, + "color": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", + "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", + "dev": true, + "requires": { + "clone": "1.0.2", + "color-convert": "1.9.0", + "color-string": "0.3.0" + } + }, + "color-convert": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.0.tgz", + "integrity": "sha1-Gsz5fdc5uYO/mU1W/sj5WFNkG3o=", + "requires": { + "color-name": "1.1.3" + } + }, + "color-diff": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/color-diff/-/color-diff-0.1.7.tgz", + "integrity": "sha1-bbeM2UgqjkWdQIIer0tQMoPcuOI=", + "dev": true + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "color-string": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "colorguard": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/colorguard/-/colorguard-1.2.0.tgz", + "integrity": "sha1-8/rK9cquuk71RlPZ+yW7cxd8DYQ=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "color-diff": "0.1.7", + "log-symbols": "1.0.2", + "object-assign": "4.1.1", + "pipetteur": "2.0.3", + "plur": "2.1.2", + "postcss": "5.2.17", + "postcss-reporter": "1.4.1", + "text-table": "0.2.0", + "yargs": "1.3.3" + }, + "dependencies": { + "postcss-reporter": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz", + "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "lodash": "4.17.2", + "log-symbols": "1.0.2", + "postcss": "5.2.17" + } + }, + "yargs": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz", + "integrity": "sha1-BU3oth8i7v23IHBZ6u+da4P7kxo=", + "dev": true + } + } + }, + "colormin": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", + "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", + "dev": true, + "requires": { + "color": "0.11.4", + "css-color-names": "0.0.4", + "has": "1.0.1" + } + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "requires": { + "graceful-readlink": "1.0.1" + } + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true + }, + "commonmark": { + "version": "0.24.0", + "resolved": "https://registry.npmjs.org/commonmark/-/commonmark-0.24.0.tgz", + "integrity": "sha1-uA3gGCxUY1VkOqFdsSv7KCNoJ48=", + "requires": { + "entities": "1.1.1", + "mdurl": "1.0.1", + "string.prototype.repeat": "0.2.0" + } + }, + "commonmark-react-renderer": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/commonmark-react-renderer/-/commonmark-react-renderer-4.3.3.tgz", + "integrity": "sha1-nEvKE4vIMoe655LM8TNzi+nLxvo=", + "requires": { + "in-publish": "2.0.0", + "lodash.assign": "4.2.0", + "lodash.isplainobject": "4.0.6", + "pascalcase": "0.1.1", + "xss-filters": "1.2.7" + } + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + }, + "concat-stream": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.0.tgz", + "integrity": "sha1-CqxmL9Ur54lk1VMvaUeE5wEQrPc=", + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "typedarray": "0.0.6" + } + }, + "console-browserify": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", + "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "dev": true, + "requires": { + "date-now": "0.1.4" + }, + "dependencies": { + "date-now": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", + "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", + "dev": true + } + } + }, + "console-control-strings": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", + "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=" + }, + "console-stream": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/console-stream/-/console-stream-0.1.1.tgz", + "integrity": "sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=", + "dev": true + }, + "constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true + }, + "content-disposition": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", + "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", + "dev": true + }, + "content-type": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz", + "integrity": "sha1-t9ETrueo3Se9IRM8TcJSnfFyHu0=", + "dev": true + }, + "content-type-parser": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.1.tgz", + "integrity": "sha1-w+VpiMU8ZRJ/tG1AMqOpACRv3JQ=", + "dev": true + }, + "convert-source-map": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.0.tgz", + "integrity": "sha1-ms1whRxtXf3ZPZKC5e35SgP/RrU=" + }, + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", + "dev": true + }, + "copy-to-clipboard": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz", + "integrity": "sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==", + "requires": { + "toggle-selection": "1.0.6" + } + }, + "copy-webpack-plugin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.0.1.tgz", + "integrity": "sha1-lyjjg7lDFgUNDHRjlY8rhcCqggA=", + "dev": true, + "requires": { + "bluebird": "2.11.0", + "fs-extra": "0.26.7", + "glob": "6.0.4", + "is-glob": "3.1.0", + "loader-utils": "0.2.17", + "lodash": "4.17.2", + "minimatch": "3.0.4", + "node-dir": "0.1.17" + }, + "dependencies": { + "glob": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz", + "integrity": "sha1-DwiGD2oVUSey+t1PnOJLGqtuTSI=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "core-js": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.1.tgz", + "integrity": "sha1-TekR5mew6ukSTjQlS1OupvxhjT4=" + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + }, + "cosmiconfig": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", + "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", + "dev": true, + "requires": { + "is-directory": "0.3.1", + "js-yaml": "3.6.1", + "minimist": "1.2.0", + "object-assign": "4.1.1", + "os-homedir": "1.0.2", + "parse-json": "2.2.0", + "require-from-string": "1.2.1" + } + }, + "coveralls": { + "version": "2.11.16", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.11.16.tgz", + "integrity": "sha1-2pBhJlFC3e6VT2g3kSK+l76KtLE=", + "dev": true, + "requires": { + "js-yaml": "3.6.1", + "lcov-parse": "0.0.10", + "log-driver": "1.2.5", + "minimist": "1.2.0", + "request": "2.79.0" + }, + "dependencies": { + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", + "dev": true + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "dev": true + }, + "har-validator": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "commander": "2.11.0", + "is-my-json-valid": "2.16.0", + "pinkie-promise": "2.0.1" + } + }, + "request": { + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "dev": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.11.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "2.0.6", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.16", + "oauth-sign": "0.8.2", + "qs": "6.3.0", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.4.3", + "uuid": "3.0.0" + } + }, + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true + } + } + }, + "create-ecdh": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.0.tgz", + "integrity": "sha1-iIxyNZbN92EvZJgjPuvXo1MBc30=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "elliptic": "6.4.0" + } + }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "create-hash": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.1.3.tgz", + "integrity": "sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0=", + "requires": { + "cipher-base": "1.0.4", + "inherits": "2.0.3", + "ripemd160": "2.0.1", + "sha.js": "2.4.8" + } + }, + "create-hmac": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.6.tgz", + "integrity": "sha1-rLniIaThe9sHbpBlfEK5PjcmzwY=", + "requires": { + "cipher-base": "1.0.4", + "create-hash": "1.1.3", + "inherits": "2.0.3", + "ripemd160": "2.0.1", + "safe-buffer": "5.1.1", + "sha.js": "2.4.8" + } + }, + "create-thenable": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/create-thenable/-/create-thenable-1.0.2.tgz", + "integrity": "sha1-4gMXIMzJV12M+jH1wUbnYqgMBTQ=", + "dev": true, + "requires": { + "object.omit": "2.0.1", + "unique-concat": "0.2.2" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "dev": true, + "requires": { + "lru-cache": "4.1.1", + "shebang-command": "1.2.0", + "which": "1.2.14" + } + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "requires": { + "boom": "2.10.1" + } + }, + "crypto-browserify": { + "version": "3.11.1", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz", + "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==", + "dev": true, + "requires": { + "browserify-cipher": "1.0.0", + "browserify-sign": "4.0.4", + "create-ecdh": "4.0.0", + "create-hash": "1.1.3", + "create-hmac": "1.1.6", + "diffie-hellman": "5.0.2", + "inherits": "2.0.3", + "pbkdf2": "3.0.12", + "public-encrypt": "4.0.0", + "randombytes": "2.0.5" + } + }, + "crypto-js": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.1.8.tgz", + "integrity": "sha1-cV8HC/YBTyrpkqmLOSkli3E/CNU=" + }, + "css-color-names": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", + "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", + "dev": true + }, + "css-loader": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.26.1.tgz", + "integrity": "sha1-K6fyATG5NZdJaz6btQB4WknNKeo=", + "dev": true, + "requires": { + "babel-code-frame": "6.22.0", + "css-selector-tokenizer": "0.7.0", + "cssnano": "3.10.0", + "loader-utils": "0.2.17", + "lodash.camelcase": "4.3.0", + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-modules-extract-imports": "1.1.0", + "postcss-modules-local-by-default": "1.2.0", + "postcss-modules-scope": "1.1.0", + "postcss-modules-values": "1.3.0", + "source-list-map": "0.1.8" + } + }, + "css-rule-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/css-rule-stream/-/css-rule-stream-1.1.0.tgz", + "integrity": "sha1-N4bnGYmD2WWibjGVfgkHjLt3BaI=", + "dev": true, + "requires": { + "css-tokenize": "1.0.1", + "duplexer2": "0.0.2", + "ldjson-stream": "1.2.1", + "through2": "0.6.5" + }, + "dependencies": { + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", + "dev": true, + "requires": { + "boolbase": "1.0.0", + "css-what": "2.1.0", + "domutils": "1.5.1", + "nth-check": "1.0.1" + } + }, + "css-selector-tokenizer": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", + "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", + "dev": true, + "requires": { + "cssesc": "0.1.0", + "fastparse": "1.1.1", + "regexpu-core": "1.0.0" + }, + "dependencies": { + "regexpu-core": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", + "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", + "dev": true, + "requires": { + "regenerate": "1.3.2", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" + } + } + } + }, + "css-tokenize": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/css-tokenize/-/css-tokenize-1.0.1.tgz", + "integrity": "sha1-RiXLHtohwUOFi3+B1oA8HSb8FL4=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "1.1.14" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "css-what": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", + "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", + "dev": true + }, + "cssesc": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", + "dev": true + }, + "cssnano": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", + "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", + "dev": true, + "requires": { + "autoprefixer": "6.7.7", + "decamelize": "1.2.0", + "defined": "1.0.0", + "has": "1.0.1", + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-calc": "5.3.1", + "postcss-colormin": "2.2.2", + "postcss-convert-values": "2.6.1", + "postcss-discard-comments": "2.0.4", + "postcss-discard-duplicates": "2.1.0", + "postcss-discard-empty": "2.1.0", + "postcss-discard-overridden": "0.1.1", + "postcss-discard-unused": "2.2.3", + "postcss-filter-plugins": "2.0.2", + "postcss-merge-idents": "2.1.7", + "postcss-merge-longhand": "2.0.2", + "postcss-merge-rules": "2.1.2", + "postcss-minify-font-values": "1.0.5", + "postcss-minify-gradients": "1.0.5", + "postcss-minify-params": "1.2.2", + "postcss-minify-selectors": "2.1.1", + "postcss-normalize-charset": "1.1.1", + "postcss-normalize-url": "3.0.8", + "postcss-ordered-values": "2.2.3", + "postcss-reduce-idents": "2.4.0", + "postcss-reduce-initial": "1.0.1", + "postcss-reduce-transforms": "1.0.4", + "postcss-svgo": "2.1.6", + "postcss-unique-selectors": "2.0.2", + "postcss-value-parser": "3.3.0", + "postcss-zindex": "2.2.0" + } + }, + "csso": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", + "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", + "dev": true, + "requires": { + "clap": "1.2.0", + "source-map": "0.5.6" + } + }, + "cssom": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", + "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=", + "dev": true + }, + "cssstyle": { + "version": "0.2.37", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "dev": true, + "requires": { + "cssom": "0.3.2" + } + }, + "currently-unhandled": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", + "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", + "requires": { + "array-find-index": "1.0.2" + } + }, + "d": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", + "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", + "dev": true, + "requires": { + "es5-ext": "0.10.24" + } + }, + "d3-array": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.0.tgz", + "integrity": "sha1-FH0mlyDhdMQFen9CvosPPyulMQg=" + }, + "d3-collection": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.4.tgz", + "integrity": "sha1-NC39EoN8kJdPM/HMCnha6lcNzcI=" + }, + "d3-color": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.0.3.tgz", + "integrity": "sha1-vHZD/KjlOoNH4vva/6I2eWtYUJs=" + }, + "d3-format": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.2.0.tgz", + "integrity": "sha1-a0gLqohohdRlHcJIqPSsnaFtsHo=" + }, + "d3-interpolate": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.5.tgz", + "integrity": "sha1-aeCZ/zkhRxblY8muw+qdHqS4p58=", + "requires": { + "d3-color": "1.0.3" + } + }, + "d3-path": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.5.tgz", + "integrity": "sha1-JB6xhJvZ6egCHA0KeZ+KDo5EF2Q=" + }, + "d3-scale": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.0.tgz", + "integrity": "sha1-C0F1yjHL5l4lRCfkZi3678NzRi0=", + "requires": { + "d3-array": "1.2.0", + "d3-collection": "1.0.4", + "d3-color": "1.0.3", + "d3-format": "1.2.0", + "d3-interpolate": "1.1.5", + "d3-time": "1.0.7", + "d3-time-format": "2.0.5" + } + }, + "d3-shape": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.0.0.tgz", + "integrity": "sha1-zKMySHV55Fc1TIg4oKKDvmOEWbo=", + "requires": { + "d3-path": "1.0.5" + } + }, + "d3-time": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.0.7.tgz", + "integrity": "sha1-lMr27bt4ebuAnQ0fdXK8SEgvcnA=" + }, + "d3-time-format": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.0.5.tgz", + "integrity": "sha1-nXeAIE98kRnJFwsaVttN6aivly4=", + "requires": { + "d3-time": "1.0.7" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "date-difference": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/date-difference/-/date-difference-1.0.0.tgz", + "integrity": "sha1-0+bog8DK0tydv8vxLgYpe5cpiXQ=", + "requires": { + "get-stdin": "3.0.2", + "meow": "3.7.0" + } + }, + "date-now": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/date-now/-/date-now-1.0.1.tgz", + "integrity": "sha1-u30IZDjevkGCpIX7PfP7+5nWFTw=" + }, + "dateformat": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.0.0.tgz", + "integrity": "sha1-J0Pjq7XD/CRi5SfcpEXgTp9N7hc=" + }, + "death": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/death/-/death-1.1.0.tgz", + "integrity": "sha1-AaqcQB7dknUFFEcLgmY5DGbGcxg=" + }, + "debounce": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.0.0.tgz", + "integrity": "sha1-CUivUT0uTOQHkW+FBqQj0/nPctg=", + "requires": { + "date-now": "1.0.1" + } + }, + "debug": { + "version": "2.6.8", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", + "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", + "requires": { + "ms": "2.0.0" + } + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decompress": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/decompress/-/decompress-3.0.0.tgz", + "integrity": "sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=", + "requires": { + "buffer-to-vinyl": "1.1.0", + "concat-stream": "1.6.0", + "decompress-tar": "3.1.0", + "decompress-tarbz2": "3.1.0", + "decompress-targz": "3.1.0", + "decompress-unzip": "3.4.0", + "stream-combiner2": "1.1.1", + "vinyl-assign": "1.2.1", + "vinyl-fs": "2.4.4" + } + }, + "decompress-tar": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/decompress-tar/-/decompress-tar-3.1.0.tgz", + "integrity": "sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=", + "requires": { + "is-tar": "1.0.0", + "object-assign": "2.1.1", + "strip-dirs": "1.1.1", + "tar-stream": "1.5.4", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "decompress-tarbz2": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz", + "integrity": "sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=", + "requires": { + "is-bzip2": "1.0.0", + "object-assign": "2.1.1", + "seek-bzip": "1.0.5", + "strip-dirs": "1.1.1", + "tar-stream": "1.5.4", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "decompress-targz": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/decompress-targz/-/decompress-targz-3.1.0.tgz", + "integrity": "sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=", + "requires": { + "is-gzip": "1.0.0", + "object-assign": "2.1.1", + "strip-dirs": "1.1.1", + "tar-stream": "1.5.4", + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=" + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + } + } + }, + "decompress-unzip": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/decompress-unzip/-/decompress-unzip-3.4.0.tgz", + "integrity": "sha1-YUdbQVIGa74/7hL51inRX+ZHjus=", + "requires": { + "is-zip": "1.0.0", + "read-all-stream": "3.1.0", + "stat-mode": "0.2.2", + "strip-dirs": "1.1.1", + "through2": "2.0.3", + "vinyl": "1.2.0", + "yauzl": "2.8.0" + }, + "dependencies": { + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + } + } + }, + "deep-eql": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-0.1.3.tgz", + "integrity": "sha1-71WKyrjeJSBs1xOQbXTlaTDrafI=", + "dev": true, + "requires": { + "type-detect": "0.1.1" + }, + "dependencies": { + "type-detect": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-0.1.1.tgz", + "integrity": "sha1-C6XsKohWQORw6k6FBZcZANrFiCI=", + "dev": true + } + } + }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", + "dev": true + }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "dev": true + }, + "default-require-extensions": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-1.0.0.tgz", + "integrity": "sha1-836hXT4T/9m0N9M+GnW1+5eHTLg=", + "dev": true, + "requires": { + "strip-bom": "2.0.0" + } + }, + "defaults": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz", + "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=", + "requires": { + "clone": "1.0.2" + } + }, + "define-properties": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", + "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", + "dev": true, + "requires": { + "foreach": "2.0.5", + "object-keys": "1.0.11" + } + }, + "defined": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", + "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", + "dev": true + }, + "del": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/del/-/del-2.2.2.tgz", + "integrity": "sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=", + "dev": true, + "requires": { + "globby": "5.0.0", + "is-path-cwd": "1.0.0", + "is-path-in-cwd": "1.0.0", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "rimraf": "2.6.1" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "delegates": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", + "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=" + }, + "depd": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", + "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", + "dev": true + }, + "des.js": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", + "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0" + } + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "dev": true + }, + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "requires": { + "repeating": "2.0.1" + } + }, + "diff": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-1.4.0.tgz", + "integrity": "sha1-fyjS657nsVqX79ic5j3P2qPMur8=", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.2.tgz", + "integrity": "sha1-tYNXOScM/ias9jIJn97SoH8gnl4=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "miller-rabin": "4.0.0", + "randombytes": "2.0.5" + } + }, + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "2.0.2", + "isarray": "1.0.0" + } + }, + "doiuse": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/doiuse/-/doiuse-2.6.0.tgz", + "integrity": "sha1-GJLRC2Gpo1at2/K2FJM+gfi7ODQ=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-db": "1.0.30000708", + "css-rule-stream": "1.1.0", + "duplexer2": "0.0.2", + "jsonfilter": "1.1.2", + "ldjson-stream": "1.2.1", + "lodash": "4.17.2", + "multimatch": "2.1.0", + "postcss": "5.2.17", + "source-map": "0.4.4", + "through2": "0.6.5", + "yargs": "3.32.0" + }, + "dependencies": { + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "window-size": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.4.tgz", + "integrity": "sha1-+OGqHuWlPsW/FR/6CXQqatdpeHY=", + "dev": true + }, + "yargs": { + "version": "3.32.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.32.0.tgz", + "integrity": "sha1-AwiOnr+edWtpdRYR0qXvWRSCyZU=", + "dev": true, + "requires": { + "camelcase": "2.1.1", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "os-locale": "1.4.0", + "string-width": "1.0.2", + "window-size": "0.1.4", + "y18n": "3.2.1" + } + } + } + }, + "dom-converter": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz", + "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=", + "dev": true, + "requires": { + "utila": "0.3.3" + }, + "dependencies": { + "utila": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", + "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", + "dev": true + } + } + }, + "dom-helpers": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.2.1.tgz", + "integrity": "sha1-MgPgf+0he9H0JLAZc1WC/Deyglo=" + }, + "dom-serializer": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", + "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", + "dev": true, + "requires": { + "domelementtype": "1.1.3", + "entities": "1.1.1" + }, + "dependencies": { + "domelementtype": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", + "dev": true + } + } + }, + "dom-walk": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz", + "integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=", + "dev": true + }, + "domain-browser": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz", + "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw=", + "dev": true + }, + "domelementtype": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", + "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", + "dev": true + }, + "domhandler": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.1.tgz", + "integrity": "sha1-iS5HAAqZvlW783dP/qBWHYh5wlk=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "dev": true, + "requires": { + "dom-serializer": "0.1.0", + "domelementtype": "1.3.0" + } + }, + "download": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/download/-/download-4.4.3.tgz", + "integrity": "sha1-qlX9rTktldS2jowr4D4MKqIbqaw=", + "requires": { + "caw": "1.2.0", + "concat-stream": "1.6.0", + "each-async": "1.1.1", + "filenamify": "1.2.1", + "got": "5.7.1", + "gulp-decompress": "1.2.0", + "gulp-rename": "1.2.2", + "is-url": "1.2.2", + "object-assign": "4.1.1", + "read-all-stream": "3.1.0", + "readable-stream": "2.3.3", + "stream-combiner2": "1.1.1", + "vinyl": "1.2.0", + "vinyl-fs": "2.4.4", + "ware": "1.3.0" + } + }, + "drbg.js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/drbg.js/-/drbg.js-1.0.1.tgz", + "integrity": "sha1-Pja2xCs3BDgjzbwzLVjzHiRFSAs=", + "requires": { + "browserify-aes": "1.0.6", + "create-hash": "1.1.3", + "create-hmac": "1.1.6" + } + }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, + "duplexer2": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz", + "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=", + "requires": { + "readable-stream": "2.3.3" + } + }, + "duplexify": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.0.tgz", + "integrity": "sha1-GqdzAC4VeEV+nZ1KULDMquvL1gQ=", + "requires": { + "end-of-stream": "1.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + }, + "dependencies": { + "end-of-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz", + "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=", + "requires": { + "once": "1.3.3" + } + }, + "once": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz", + "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=", + "requires": { + "wrappy": "1.0.2" + } + } + } + }, + "each-async": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/each-async/-/each-async-1.1.1.tgz", + "integrity": "sha1-3uUim98KtrogEqOV4bhpq/iBNHM=", + "requires": { + "onetime": "1.1.0", + "set-immediate-shim": "1.0.1" + } + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "editions": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/editions/-/editions-1.3.3.tgz", + "integrity": "sha1-CQcQG92iD6w8vjNMJ8vQaI3Jmls=" + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", + "dev": true + }, + "ejs": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-1.0.0.tgz", + "integrity": "sha1-ycYKSKRu5FL7MqccMXuV5aofyz0=", + "dev": true + }, + "ejs-loader": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ejs-loader/-/ejs-loader-0.3.0.tgz", + "integrity": "sha1-aHNv3CMaSQ7fkZpkRq2dkFWlh74=", + "dev": true, + "requires": { + "loader-utils": "0.2.17", + "lodash": "3.10.1" + }, + "dependencies": { + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=", + "dev": true + } + } + }, + "ejsify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ejsify/-/ejsify-1.0.0.tgz", + "integrity": "sha1-NxlPWoXBKuQ4QpOVeZ7Ee0O8RT8=", + "dev": true, + "requires": { + "ejs": "1.0.0", + "through": "2.3.8" + } + }, + "electron-to-chromium": { + "version": "1.3.16", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.16.tgz", + "integrity": "sha1-0OAmc1dUdwkBrjAaIWZMukXZL30=", + "dev": true + }, + "element-resize-detector": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.1.12.tgz", + "integrity": "sha1-iz/W7t2hf5wAs2Cg6i35knroC6I=", + "requires": { + "batch-processor": "1.0.0" + } + }, + "elliptic": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", + "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", + "requires": { + "bn.js": "4.11.7", + "brorand": "1.1.0", + "hash.js": "1.1.3", + "hmac-drbg": "1.0.1", + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0", + "minimalistic-crypto-utils": "1.0.1" + } + }, + "emojis-list": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=" + }, + "empty-module": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/empty-module/-/empty-module-0.0.2.tgz", + "integrity": "sha1-E7TdjUr+3dNeUMGNzXiMUQh/FUU=", + "dev": true + }, + "encodeurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz", + "integrity": "sha1-eePVhlU0aQn+bw9Fpd5oEDspTSA=", + "dev": true + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "requires": { + "iconv-lite": "0.4.18" + } + }, + "end-of-stream": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.0.tgz", + "integrity": "sha1-epDYM+/abPpurA9JSduw+tOmMgY=", + "requires": { + "once": "1.4.0" + } + }, + "enhanced-resolve": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", + "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "memory-fs": "0.4.1", + "object-assign": "4.1.1", + "tapable": "0.2.7" + } + }, + "entities": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", + "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=" + }, + "enzyme": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/enzyme/-/enzyme-2.7.1.tgz", + "integrity": "sha1-djcOHZnpH3MJG7jEMUt8EozC1iE=", + "dev": true, + "requires": { + "cheerio": "0.22.0", + "function.prototype.name": "1.0.3", + "is-subset": "0.1.1", + "lodash": "4.17.2", + "object-is": "1.0.1", + "object.assign": "4.0.4", + "object.entries": "1.0.4", + "object.values": "1.0.4", + "uuid": "2.0.3" + }, + "dependencies": { + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=", + "dev": true + } + } + }, + "errno": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.4.tgz", + "integrity": "sha1-uJbiOp5ei6M4cfyZar02NfyaHH0=", + "dev": true, + "requires": { + "prr": "0.0.0" + } + }, + "error-ex": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz", + "integrity": "sha1-+FWobOYa3E6GIcPNoh56dhLDqNw=", + "requires": { + "is-arrayish": "0.2.1" + } + }, + "error-stack-parser": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-1.3.6.tgz", + "integrity": "sha1-4Oc7k+QXE40c18C3RrGkoUhUwpI=", + "dev": true, + "requires": { + "stackframe": "0.3.1" + } + }, + "es-abstract": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.7.0.tgz", + "integrity": "sha1-363ndOAb/Nl/lhgCmMRJyGI/uUw=", + "dev": true, + "requires": { + "es-to-primitive": "1.1.1", + "function-bind": "1.1.0", + "is-callable": "1.1.3", + "is-regex": "1.0.4" + } + }, + "es-to-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", + "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", + "dev": true, + "requires": { + "is-callable": "1.1.3", + "is-date-object": "1.0.1", + "is-symbol": "1.0.1" + } + }, + "es5-ext": { + "version": "0.10.24", + "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.24.tgz", + "integrity": "sha1-pVh3yZJLwMjZvTwsvhdJWsFwmxQ=", + "dev": true, + "requires": { + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } + }, + "es6-error": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.0.0.tgz", + "integrity": "sha1-8JTHBB9mJZm7EnINoFnWucf/D0A=" + }, + "es6-iterator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.1.tgz", + "integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.24", + "es6-symbol": "3.1.1" + } + }, + "es6-map": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", + "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.24", + "es6-iterator": "2.0.1", + "es6-set": "0.1.5", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-promise": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.0.5.tgz", + "integrity": "sha1-eILzCt3lskDM+n99eMVIMwlRrkI=" + }, + "es6-set": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", + "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.24", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1", + "event-emitter": "0.3.5" + } + }, + "es6-symbol": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", + "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.24" + } + }, + "es6-templates": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/es6-templates/-/es6-templates-0.2.3.tgz", + "integrity": "sha1-XLmsn7He1usSOTQrgdeSu7QHjuQ=", + "dev": true, + "requires": { + "recast": "0.11.23", + "through": "2.3.8" + } + }, + "es6-weak-map": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", + "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.24", + "es6-iterator": "2.0.1", + "es6-symbol": "3.1.1" + } + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "escodegen": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz", + "integrity": "sha1-WltTr0aTEQvrsIZ6o0MN07cKEBg=", + "dev": true, + "requires": { + "esprima": "2.7.3", + "estraverse": "1.9.3", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.2.0" + }, + "dependencies": { + "estraverse": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz", + "integrity": "sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=", + "dev": true + }, + "source-map": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz", + "integrity": "sha1-2rc/vPwrqBm03gO9b26qSBZLP50=", + "dev": true, + "optional": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "escope": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", + "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", + "dev": true, + "requires": { + "es6-map": "0.1.5", + "es6-weak-map": "2.0.2", + "esrecurse": "4.2.0", + "estraverse": "4.2.0" + } + }, + "eslint": { + "version": "3.16.1", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-3.16.1.tgz", + "integrity": "sha1-m8MfxzQWks93LoBgdQj2fXEcVgk=", + "dev": true, + "requires": { + "babel-code-frame": "6.22.0", + "chalk": "1.1.3", + "concat-stream": "1.6.0", + "debug": "2.6.8", + "doctrine": "1.5.0", + "escope": "3.6.0", + "espree": "3.4.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "file-entry-cache": "2.0.0", + "glob": "7.1.2", + "globals": "9.18.0", + "ignore": "3.3.3", + "imurmurhash": "0.1.4", + "inquirer": "0.12.0", + "is-my-json-valid": "2.16.0", + "is-resolvable": "1.0.0", + "js-yaml": "3.6.1", + "json-stable-stringify": "1.0.1", + "levn": "0.3.0", + "lodash": "4.17.2", + "mkdirp": "0.5.1", + "natural-compare": "1.4.0", + "optionator": "0.8.2", + "path-is-inside": "1.0.2", + "pluralize": "1.2.1", + "progress": "1.1.8", + "require-uncached": "1.0.3", + "shelljs": "0.7.8", + "strip-bom": "3.0.0", + "strip-json-comments": "2.0.1", + "table": "3.8.3", + "text-table": "0.2.0", + "user-home": "2.0.0" + }, + "dependencies": { + "ansi-escapes": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz", + "integrity": "sha1-06ioOzGapneTZisT52HHkRQiMG4=", + "dev": true + }, + "cli-cursor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz", + "integrity": "sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=", + "dev": true, + "requires": { + "restore-cursor": "1.0.1" + } + }, + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "inquirer": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz", + "integrity": "sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=", + "dev": true, + "requires": { + "ansi-escapes": "1.4.0", + "ansi-regex": "2.1.1", + "chalk": "1.1.3", + "cli-cursor": "1.0.2", + "cli-width": "2.1.0", + "figures": "1.7.0", + "lodash": "4.17.2", + "readline2": "1.0.1", + "run-async": "0.1.0", + "rx-lite": "3.1.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "through": "2.3.8" + } + }, + "restore-cursor": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz", + "integrity": "sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=", + "dev": true, + "requires": { + "exit-hook": "1.1.1", + "onetime": "1.1.0" + } + }, + "run-async": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz", + "integrity": "sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, + "rx-lite": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz", + "integrity": "sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=", + "dev": true + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + }, + "user-home": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz", + "integrity": "sha1-nHC/2Babwdy/SGBODwS4tJzenp8=", + "dev": true, + "requires": { + "os-homedir": "1.0.2" + } + } + } + }, + "eslint-config-semistandard": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-semistandard/-/eslint-config-semistandard-7.0.0.tgz", + "integrity": "sha1-+ANJP1alFy9/WcNa5kg2C0Hy/3E=", + "dev": true + }, + "eslint-config-standard": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-6.2.1.tgz", + "integrity": "sha1-06aKr8cZFjnn7kQec0hzkCY1QpI=", + "dev": true + }, + "eslint-config-standard-jsx": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-jsx/-/eslint-config-standard-jsx-3.3.0.tgz", + "integrity": "sha1-yrCAGhWjYL9j+suXqyL73YjYpeA=", + "dev": true + }, + "eslint-config-standard-react": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-config-standard-react/-/eslint-config-standard-react-4.2.0.tgz", + "integrity": "sha1-0V/SXoN+IK/w2zL2T7VdEYgOuNA=", + "dev": true, + "requires": { + "eslint-config-standard-jsx": "3.3.0" + } + }, + "eslint-plugin-promise": { + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-3.4.2.tgz", + "integrity": "sha1-G+J5Pq/i0YtbEjuBNsJp+AT+cSI=", + "dev": true + }, + "eslint-plugin-react": { + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-6.10.0.tgz", + "integrity": "sha1-nEi0jRAVVLU1VBPnxkI4q95u8e8=", + "dev": true, + "requires": { + "array.prototype.find": "2.0.4", + "doctrine": "1.5.0", + "has": "1.0.1", + "jsx-ast-utils": "1.4.1", + "object.assign": "4.0.4" + } + }, + "eslint-plugin-standard": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-standard/-/eslint-plugin-standard-2.0.1.tgz", + "integrity": "sha1-NYlpn/nJF/LCX3apFmh/ZBw2n/M=", + "dev": true + }, + "espree": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/espree/-/espree-3.4.3.tgz", + "integrity": "sha1-KRC1zNSc6JPC//+qtP2LOjG4I3Q=", + "dev": true, + "requires": { + "acorn": "5.1.1", + "acorn-jsx": "3.0.1" + } + }, + "esprima": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", + "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", + "dev": true + }, + "esrecurse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.0.tgz", + "integrity": "sha1-+pVo2Y04I/mkHZHpAtyrnqblsWM=", + "dev": true, + "requires": { + "estraverse": "4.2.0", + "object-assign": "4.1.1" + } + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" + }, + "etag": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz", + "integrity": "sha1-A9MLX2fdbmMtKUXTDWZScxo01dg=", + "dev": true + }, + "ethereum-common": { + "version": "0.0.18", + "resolved": "https://registry.npmjs.org/ethereum-common/-/ethereum-common-0.0.18.tgz", + "integrity": "sha1-L9w1dvIykDNYl26znaeDIT/5Uj8=" + }, + "ethereumjs-tx": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/ethereumjs-tx/-/ethereumjs-tx-1.2.5.tgz", + "integrity": "sha1-7TbX/+uXvIicYe7xq3b0emE9goY=", + "requires": { + "ethereum-common": "0.0.18", + "ethereumjs-util": "5.1.2" + } + }, + "ethereumjs-util": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.2.tgz", + "integrity": "sha1-JboCFcu0wvCxCKb5avKi5i5Fkh8=", + "requires": { + "babel-preset-es2015": "6.24.1", + "babelify": "7.3.0", + "bn.js": "4.11.7", + "create-hash": "1.1.3", + "ethjs-util": "0.1.4", + "keccak": "1.3.0", + "rlp": "2.0.0", + "secp256k1": "3.3.0" + }, + "dependencies": { + "babel-preset-es2015": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/babel-preset-es2015/-/babel-preset-es2015-6.24.1.tgz", + "integrity": "sha1-1EBQ1rwsn+6nAqrzjXJ6AhBTiTk=", + "requires": { + "babel-plugin-check-es2015-constants": "6.22.0", + "babel-plugin-transform-es2015-arrow-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", + "babel-plugin-transform-es2015-block-scoping": "6.24.1", + "babel-plugin-transform-es2015-classes": "6.24.1", + "babel-plugin-transform-es2015-computed-properties": "6.24.1", + "babel-plugin-transform-es2015-destructuring": "6.23.0", + "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", + "babel-plugin-transform-es2015-for-of": "6.23.0", + "babel-plugin-transform-es2015-function-name": "6.24.1", + "babel-plugin-transform-es2015-literals": "6.22.0", + "babel-plugin-transform-es2015-modules-amd": "6.24.1", + "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", + "babel-plugin-transform-es2015-modules-umd": "6.24.1", + "babel-plugin-transform-es2015-object-super": "6.24.1", + "babel-plugin-transform-es2015-parameters": "6.24.1", + "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", + "babel-plugin-transform-es2015-spread": "6.22.0", + "babel-plugin-transform-es2015-sticky-regex": "6.24.1", + "babel-plugin-transform-es2015-template-literals": "6.22.0", + "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", + "babel-plugin-transform-es2015-unicode-regex": "6.24.1", + "babel-plugin-transform-regenerator": "6.24.1" + } + } + } + }, + "ethjs-util": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/ethjs-util/-/ethjs-util-0.1.4.tgz", + "integrity": "sha1-HItoeSV0RO9NPz+7rC3tEs2ZfZM=", + "requires": { + "is-hex-prefixed": "1.0.0", + "strip-hex-prefix": "1.0.0" + } + }, + "event-emitter": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", + "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", + "dev": true, + "requires": { + "d": "1.0.0", + "es5-ext": "0.10.24" + } + }, + "eventemitter3": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.2.tgz", + "integrity": "sha1-IM5IkZCc6fNbCIyU+rQOLJb0c6w=" + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", + "dev": true + }, + "evp_bytestokey": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.0.tgz", + "integrity": "sha1-SXtmrZ/vZc18CKYYCCS6FHa2blM=", + "requires": { + "create-hash": "1.1.3" + } + }, + "exec-buffer": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/exec-buffer/-/exec-buffer-3.2.0.tgz", + "integrity": "sha512-wsiD+2Tp6BWHoVv3B+5Dcx6E7u5zky+hUwOHjuH2hKSLR3dvRmX8fk8UD8uqQixHs4Wk6eDmiegVrMPjKj7wpA==", + "dev": true, + "requires": { + "execa": "0.7.0", + "p-finally": "1.0.0", + "pify": "3.0.0", + "rimraf": "2.6.1", + "tempfile": "2.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "exec-series": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/exec-series/-/exec-series-1.0.3.tgz", + "integrity": "sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=", + "dev": true, + "requires": { + "async-each-series": "1.1.0", + "object-assign": "4.1.1" + } + }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "dev": true, + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, + "execall": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execall/-/execall-1.0.0.tgz", + "integrity": "sha1-c9CQTjlbPKsGWLCNCewlMH8pu3M=", + "dev": true, + "requires": { + "clone-regexp": "1.0.0" + } + }, + "executable": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/executable/-/executable-1.1.0.tgz", + "integrity": "sha1-h3mA6REvM5EGbaNyZd562ENKtNk=", + "dev": true, + "requires": { + "meow": "3.7.0" + } + }, + "exit-hook": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz", + "integrity": "sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=", + "dev": true + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "requires": { + "fill-range": "2.2.3" + } + }, + "expand-template": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/expand-template/-/expand-template-1.0.3.tgz", + "integrity": "sha1-bDAzIxd6YrGyLAcCefeGEoe2mxo=" + }, + "express": { + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.14.1.tgz", + "integrity": "sha1-ZGwjf3ZvFIwhIK/wc4F7nk1+DTM=", + "dev": true, + "requires": { + "accepts": "1.3.3", + "array-flatten": "1.1.1", + "content-disposition": "0.5.2", + "content-type": "1.0.2", + "cookie": "0.3.1", + "cookie-signature": "1.0.6", + "debug": "2.2.0", + "depd": "1.1.1", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.7.0", + "finalhandler": "0.5.1", + "fresh": "0.3.0", + "merge-descriptors": "1.0.1", + "methods": "1.1.2", + "on-finished": "2.3.0", + "parseurl": "1.3.1", + "path-to-regexp": "0.1.7", + "proxy-addr": "1.1.5", + "qs": "6.2.0", + "range-parser": "1.2.0", + "send": "0.14.2", + "serve-static": "1.11.2", + "type-is": "1.6.15", + "utils-merge": "1.0.0", + "vary": "1.1.1" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + }, + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true + }, + "qs": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.0.tgz", + "integrity": "sha1-O3hIwDwt7OaalSKw+ujEEm10Xzs=", + "dev": true + } + } + }, + "extend": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-1.2.1.tgz", + "integrity": "sha1-oPX9bPyDpf5J72mNYOyKYk3UV2w=" + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "0.1.1" + } + }, + "external-editor": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-2.0.4.tgz", + "integrity": "sha1-HtkZnanL/i7y96MbL96LDRI2iXI=", + "requires": { + "iconv-lite": "0.4.18", + "jschardet": "1.5.0", + "tmp": "0.0.31" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "requires": { + "is-extglob": "1.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + } + } + }, + "extract-loader": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/extract-loader/-/extract-loader-0.1.0.tgz", + "integrity": "sha1-ocFGkVJBzEhtUpImPHVV1aoZdm4=", + "dev": true, + "requires": { + "loader-utils": "0.2.17" + } + }, + "extract-text-webpack-plugin": { + "version": "2.0.0-beta.4", + "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-2.0.0-beta.4.tgz", + "integrity": "sha1-0yOTBp59kMgxjUg5IwJhi1a8G6k=", + "dev": true, + "requires": { + "async": "1.5.2", + "loader-utils": "0.2.17", + "webpack-sources": "0.1.5" + } + }, + "extsprintf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz", + "integrity": "sha1-4QgOBljjALBilJkMxw4VAiNf1VA=" + }, + "fancy-log": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.0.tgz", + "integrity": "sha1-Rb4X0Cu5kX1gzP/UmVyZnmyMmUg=", + "requires": { + "chalk": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "fast-deep-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", + "dev": true + }, + "fastparse": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", + "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=", + "dev": true + }, + "fbjs": { + "version": "0.8.14", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.14.tgz", + "integrity": "sha1-0dviviVMNakeCfMfnNUKQLKg7Rw=", + "requires": { + "core-js": "1.2.7", + "isomorphic-fetch": "2.2.1", + "loose-envify": "1.3.1", + "object-assign": "4.1.1", + "promise": "7.3.1", + "setimmediate": "1.0.5", + "ua-parser-js": "0.7.14" + }, + "dependencies": { + "core-js": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz", + "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY=" + } + } + }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "requires": { + "pend": "1.2.0" + } + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "file-entry-cache": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz", + "integrity": "sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=", + "dev": true, + "requires": { + "flat-cache": "1.2.2", + "object-assign": "4.1.1" + } + }, + "file-loader": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.10.0.tgz", + "integrity": "sha1-u+bbdHSsksf1T9wZfPVH6YtrjhI=", + "dev": true, + "requires": { + "loader-utils": "0.2.17" + } + }, + "file-saver": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-1.3.3.tgz", + "integrity": "sha1-zdTETTqiZOrC9o7BZbx5HDSvEjI=" + }, + "file-type": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", + "integrity": "sha1-JXoHg4TR24CHvESdEH1SpSZyuek=" + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=" + }, + "filename-reserved-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz", + "integrity": "sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=" + }, + "filenamify": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/filenamify/-/filenamify-1.2.1.tgz", + "integrity": "sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=", + "requires": { + "filename-reserved-regex": "1.0.0", + "strip-outer": "1.0.0", + "trim-repeated": "1.0.0" + } + }, + "fileset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", + "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", + "dev": true, + "requires": { + "glob": "7.1.2", + "minimatch": "3.0.4" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "filesize": { + "version": "3.5.10", + "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.5.10.tgz", + "integrity": "sha1-/I+iPdtO+eXgq24eZPZ5okpWdh8=", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "finalhandler": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-0.5.1.tgz", + "integrity": "sha1-LEANjUUwk1vCMlScX6OF7Afeb80=", + "dev": true, + "requires": { + "debug": "2.2.0", + "escape-html": "1.0.3", + "on-finished": "2.3.0", + "statuses": "1.3.1", + "unpipe": "1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + } + } + }, + "find-cache-dir": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-0.1.1.tgz", + "integrity": "sha1-yN765XyKUqinhPnjHFfHQumToLk=", + "dev": true, + "requires": { + "commondir": "1.0.1", + "mkdirp": "0.5.1", + "pkg-dir": "1.0.0" + } + }, + "find-parent-dir": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/find-parent-dir/-/find-parent-dir-0.3.0.tgz", + "integrity": "sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=", + "dev": true + }, + "find-up": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", + "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", + "requires": { + "path-exists": "2.1.0", + "pinkie-promise": "2.0.1" + } + }, + "find-versions": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/find-versions/-/find-versions-1.2.1.tgz", + "integrity": "sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=", + "dev": true, + "requires": { + "array-uniq": "1.0.3", + "get-stdin": "4.0.1", + "meow": "3.7.0", + "semver-regex": "1.0.0" + }, + "dependencies": { + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + } + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=" + }, + "flat": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat/-/flat-2.0.1.tgz", + "integrity": "sha1-cOKRiKdL4MPIlAnu0fqVd5B64y8=", + "requires": { + "is-buffer": "1.1.5" + } + }, + "flat-cache": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-1.2.2.tgz", + "integrity": "sha1-+oZxTnLCHbiGAXYezy9VXRq8a5Y=", + "dev": true, + "requires": { + "circular-json": "0.3.3", + "del": "2.2.2", + "graceful-fs": "4.1.11", + "write": "0.2.1" + } + }, + "flatten": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", + "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "requires": { + "for-in": "1.0.2" + } + }, + "foreach": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", + "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", + "dev": true + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.16" + } + }, + "format-json": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/format-json/-/format-json-1.0.3.tgz", + "integrity": "sha1-Jo49PhaXkv9Ju1sDDyLIfKHCzZ8=" + }, + "format-number": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/format-number/-/format-number-2.0.1.tgz", + "integrity": "sha1-6SMah0PKZLR9CVVdzkApY0O+Zus=" + }, + "formatio": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/formatio/-/formatio-1.1.1.tgz", + "integrity": "sha1-XtPM1jZVEJc4NGXZlhmRAOhhYek=", + "dev": true, + "requires": { + "samsam": "1.1.2" + } + }, + "forwarded": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz", + "integrity": "sha1-Ge+YdMSuHCl7zweP3mOgm2aoQ2M=", + "dev": true + }, + "fresh": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz", + "integrity": "sha1-ZR+DjiJCTnVm3hYdg1jKoZn4PU8=", + "dev": true + }, + "fs-extra": { + "version": "0.26.7", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz", + "integrity": "sha1-muH92UiXeY7at20JGM9C0MMYT6k=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "jsonfile": "2.4.0", + "klaw": "1.3.1", + "path-is-absolute": "1.0.1", + "rimraf": "2.6.1" + } + }, + "fs-readdir-recursive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.0.0.tgz", + "integrity": "sha1-jNF0XItPiinIyuw5JHaSG6GV9WA=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.1" + } + }, + "fstream-ignore": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz", + "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=", + "requires": { + "fstream": "1.0.11", + "inherits": "2.0.3", + "minimatch": "3.0.4" + } + }, + "function-bind": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.0.tgz", + "integrity": "sha1-FhdnFMgBeY5Ojyz391KUZ7tKV3E=", + "dev": true + }, + "function.prototype.name": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.0.3.tgz", + "integrity": "sha512-5EblxZUdioXi2JiMZ9FUbwYj40eQ9MFHyzFLBSPdlRl3SO8l7SLWuAnQ/at/1Wi4hjJwME/C5WpF2ZfAc8nGNw==", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "function-bind": "1.1.0", + "is-callable": "1.1.3" + } + }, + "gather-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gather-stream/-/gather-stream-1.0.0.tgz", + "integrity": "sha1-szmUr0V6gRVwDUEPMXczy+egkEs=", + "dev": true + }, + "gauge": { + "version": "2.7.4", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", + "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", + "requires": { + "aproba": "1.1.2", + "console-control-strings": "1.1.0", + "has-unicode": "2.0.1", + "object-assign": "4.1.1", + "signal-exit": "3.0.2", + "string-width": "1.0.2", + "strip-ansi": "3.0.1", + "wide-align": "1.1.2" + } + }, + "generate-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", + "dev": true + }, + "generate-object-property": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", + "dev": true, + "requires": { + "is-property": "1.0.2" + } + }, + "geopattern": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/geopattern/-/geopattern-1.2.3.tgz", + "integrity": "sha1-3pZgLkbbqQlcpXdL+zs2MI9+Y/4=", + "requires": { + "extend": "1.2.1" + } + }, + "get-caller-file": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", + "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=" + }, + "get-own-enumerable-property-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-1.0.1.tgz", + "integrity": "sha1-8dTjrRQC4DmJjlbR6bmqkkwm5IQ=" + }, + "get-proxy": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-proxy/-/get-proxy-1.1.0.tgz", + "integrity": "sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=", + "requires": { + "rc": "1.2.1" + } + }, + "get-stdin": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-3.0.2.tgz", + "integrity": "sha1-wc7SS5A5s43thb3xYeV3E7bdSr4=" + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "gifsicle": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/gifsicle/-/gifsicle-3.0.4.tgz", + "integrity": "sha1-9Fy17RAWW2ZdySng6TKLbIId+js=", + "dev": true, + "requires": { + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" + } + }, + "github-from-package": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/github-from-package/-/github-from-package-0.0.0.tgz", + "integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=" + }, + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + }, + "dependencies": { + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + } + } + }, + "global": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz", + "integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=", + "dev": true, + "requires": { + "min-document": "2.19.0", + "process": "0.5.2" + } + }, + "globals": { + "version": "9.18.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", + "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==" + }, + "globby": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-5.0.0.tgz", + "integrity": "sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "arrify": "1.0.1", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "globjoin": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz", + "integrity": "sha1-L0SUrIkZ43Z8XLtpHp9GMyQoXUM=", + "dev": true + }, + "glogg": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.0.tgz", + "integrity": "sha1-f+DxmfV6yQbPUS/urY+Q7kooT8U=", + "requires": { + "sparkles": "1.0.0" + } + }, + "got": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-5.7.1.tgz", + "integrity": "sha1-X4FjWmHkplifGAVp6k44FoClHzU=", + "requires": { + "create-error-class": "3.0.2", + "duplexer2": "0.1.4", + "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.0", + "node-status-codes": "1.0.0", + "object-assign": "4.1.1", + "parse-json": "2.2.0", + "pinkie-promise": "2.0.1", + "read-all-stream": "3.1.0", + "readable-stream": "2.3.3", + "timed-out": "3.1.3", + "unzip-response": "1.0.2", + "url-parse-lax": "1.0.0" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" + }, + "graceful-readlink": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", + "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=" + }, + "growl": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", + "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "dev": true + }, + "gulp-decompress": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gulp-decompress/-/gulp-decompress-1.2.0.tgz", + "integrity": "sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=", + "requires": { + "archive-type": "3.2.0", + "decompress": "3.0.0", + "gulp-util": "3.0.8", + "readable-stream": "2.3.3" + } + }, + "gulp-rename": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/gulp-rename/-/gulp-rename-1.2.2.tgz", + "integrity": "sha1-OtRCh2PwXidk3sHGfYaNsnVoeBc=" + }, + "gulp-sourcemaps": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", + "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", + "requires": { + "convert-source-map": "1.5.0", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + }, + "dependencies": { + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + } + } + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.0.0", + "fancy-log": "1.3.0", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + }, + "dependencies": { + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "requires": { + "glogg": "1.0.0" + } + }, + "handlebars": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.10.tgz", + "integrity": "sha1-PTDHGLCaPZbyPqTMH0A8TTup/08=", + "dev": true, + "requires": { + "async": "1.5.2", + "optimist": "0.6.1", + "source-map": "0.4.4", + "uglify-js": "2.8.16" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "happypack": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/happypack/-/happypack-3.0.3.tgz", + "integrity": "sha1-IveMh6MlzbeYyVjPTsOD/NTW/cc=", + "dev": true, + "requires": { + "async": "1.5.0", + "json-stringify-safe": "5.0.1", + "loader-utils": "0.2.16", + "mkdirp": "0.5.1" + }, + "dependencies": { + "async": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/async/-/async-1.5.0.tgz", + "integrity": "sha1-J5ZkJyNXOFlWVjP8YnRES+4vjOM=", + "dev": true + }, + "loader-utils": { + "version": "0.2.16", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.16.tgz", + "integrity": "sha1-8IYyBm7YKCg13/iN+1JwR2Wt7m0=", + "dev": true, + "requires": { + "big.js": "3.1.3", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" + } + } + } + }, + "har-schema": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz", + "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=" + }, + "har-validator": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz", + "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=", + "requires": { + "ajv": "4.11.8", + "har-schema": "1.0.5" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + } + } + }, + "has": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz", + "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=", + "dev": true, + "requires": { + "function-bind": "1.1.0" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "requires": { + "sparkles": "1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", + "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=" + }, + "hash-base": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-2.0.2.tgz", + "integrity": "sha1-ZuodhW206KVHDK32/OI65SRO8uE=", + "requires": { + "inherits": "2.0.3" + } + }, + "hash.js": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz", + "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==", + "requires": { + "inherits": "2.0.3", + "minimalistic-assert": "1.0.0" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "history": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/history/-/history-3.3.0.tgz", + "integrity": "sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw=", + "requires": { + "invariant": "2.2.2", + "loose-envify": "1.3.1", + "query-string": "4.3.4", + "warning": "3.0.0" + } + }, + "hmac-drbg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", + "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", + "requires": { + "hash.js": "1.1.3", + "minimalistic-assert": "1.0.0", + "minimalistic-crypto-utils": "1.0.1" + } + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=" + }, + "hoist-non-react-statics": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-1.2.0.tgz", + "integrity": "sha1-qkSM8JhtVcxAdzsXF0t90GbLfPs=" + }, + "home-or-tmp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", + "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "hosted-git-info": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz", + "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==" + }, + "html": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/html/-/html-1.0.0.tgz", + "integrity": "sha1-pUT6nqVJK/s6LMqCEKEL57WvH2E=", + "dev": true, + "requires": { + "concat-stream": "1.6.0" + } + }, + "html-comment-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", + "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", + "dev": true + }, + "html-encoding-sniffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.1.tgz", + "integrity": "sha1-eb96eF6klf5mFl5zQVPzY/9UN9o=", + "dev": true, + "requires": { + "whatwg-encoding": "1.0.1" + } + }, + "html-entities": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", + "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", + "dev": true + }, + "html-loader": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/html-loader/-/html-loader-0.4.4.tgz", + "integrity": "sha1-8rW5rNXgNf86tf02nBPJenuwFNo=", + "dev": true, + "requires": { + "es6-templates": "0.2.3", + "fastparse": "1.1.1", + "html-minifier": "3.5.3", + "loader-utils": "0.2.17", + "object-assign": "4.1.1" + } + }, + "html-minifier": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.3.tgz", + "integrity": "sha512-iKRzQQDuTCsq0Ultbi/mfJJnR0D3AdZKTq966Gsp92xkmAPCV4Xi08qhJ0Dl3ZAWemSgJ7qZK+UsZc0gFqK6wg==", + "dev": true, + "requires": { + "camel-case": "3.0.0", + "clean-css": "4.1.7", + "commander": "2.11.0", + "he": "1.1.1", + "ncname": "1.0.0", + "param-case": "2.1.1", + "relateurl": "0.2.7", + "uglify-js": "3.0.27" + }, + "dependencies": { + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "uglify-js": { + "version": "3.0.27", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.0.27.tgz", + "integrity": "sha512-HD8CmxPXUI62v5tweiulMcP/apAtx1DXGcNZkhKQZyC+MTrTsoCBb8yPAwVrbvpgw3EpRU76bRe6axjIiCYcQg==", + "dev": true, + "requires": { + "commander": "2.11.0", + "source-map": "0.5.6" + } + } + } + }, + "html-tags": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/html-tags/-/html-tags-1.2.0.tgz", + "integrity": "sha1-x43mW1Zjqll5id0rerSSANfk25g=", + "dev": true + }, + "html-webpack-plugin": { + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.28.0.tgz", + "integrity": "sha1-LnhjtX5f1I/iYzA+L/yTTDBk0Ak=", + "dev": true, + "requires": { + "bluebird": "3.5.0", + "html-minifier": "3.5.3", + "loader-utils": "0.2.17", + "lodash": "4.17.4", + "pretty-error": "2.1.1", + "toposort": "1.0.3" + }, + "dependencies": { + "bluebird": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.0.tgz", + "integrity": "sha1-eRQg1/VR7qKJdFOop3ZT+WYG1nw=", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + } + } + }, + "htmlparser2": { + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz", + "integrity": "sha1-G9+HrMoPP55T+k/M6w9LTLsAszg=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.4.1", + "domutils": "1.5.1", + "entities": "1.1.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "http-errors": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.5.1.tgz", + "integrity": "sha1-eIwNLB3iyBuebowBhDtrl+uSB1A=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "setprototypeof": "1.0.2", + "statuses": "1.3.1" + } + }, + "http-proxy": { + "version": "1.16.2", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.16.2.tgz", + "integrity": "sha1-Bt/ykpUr9k2+hHH6nfcwZtTzd0I=", + "dev": true, + "requires": { + "eventemitter3": "1.2.0", + "requires-port": "1.0.0" + }, + "dependencies": { + "eventemitter3": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-1.2.0.tgz", + "integrity": "sha1-HIaZHYFq0eUEdQ5zh0Ik7PO+xQg=", + "dev": true + } + } + }, + "http-proxy-middleware": { + "version": "0.17.3", + "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.3.tgz", + "integrity": "sha1-lAOCFHFJuFYIT1U0dS1bWoFozR0=", + "dev": true, + "requires": { + "http-proxy": "1.16.2", + "is-glob": "3.1.0", + "lodash": "4.17.2", + "micromatch": "2.3.11" + } + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.0", + "sshpk": "1.13.1" + } + }, + "https-browserify": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz", + "integrity": "sha1-P5E2XKvmC3ftDruiS0VOPgnZWoI=", + "dev": true + }, + "humanize": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/humanize/-/humanize-0.0.9.tgz", + "integrity": "sha1-GZT/rs3+nEQe0r2sdFK3u0yeQaQ=", + "dev": true + }, + "husky": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/husky/-/husky-0.13.1.tgz", + "integrity": "sha1-Ee/G/BDg7E54l3b2WCvjfXG6TM8=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "find-parent-dir": "0.3.0", + "is-ci": "1.0.10", + "normalize-path": "1.0.0" + }, + "dependencies": { + "normalize-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-1.0.0.tgz", + "integrity": "sha1-MtDkcvkf80VwHBWoMRAY07CpA3k=", + "dev": true + } + } + }, + "hyphenate-style-name": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.2.tgz", + "integrity": "sha1-MRYKNpMK2vH8BMYHT360FGXU7Es=" + }, + "iconv-lite": { + "version": "0.4.18", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.18.tgz", + "integrity": "sha512-sr1ZQph3UwHTR0XftSbK85OvBbxe/abLGzEnPENCQwmHf7sck8Oyu4ob3LgBxWWxRoM+QszeUyl7jbqapu2TqA==" + }, + "icss-replace-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", + "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", + "dev": true + }, + "ieee754": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", + "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=", + "dev": true + }, + "ignore": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.3.tgz", + "integrity": "sha1-QyNS5XrM2HqzEQ6C0/6g5HgSFW0=", + "dev": true + }, + "ignore-styles": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ignore-styles/-/ignore-styles-5.0.1.tgz", + "integrity": "sha1-tJ7yJ0va/NikiAqWa/440aC/RnE=", + "dev": true + }, + "image-webpack-loader": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/image-webpack-loader/-/image-webpack-loader-3.2.0.tgz", + "integrity": "sha1-8mMG1gSNOi9ajYROyu3StxSPCk4=", + "dev": true, + "requires": { + "file-loader": "0.9.0", + "imagemin": "5.3.1", + "imagemin-gifsicle": "5.2.0", + "imagemin-mozjpeg": "6.0.0", + "imagemin-optipng": "5.2.1", + "imagemin-pngquant": "5.0.1", + "imagemin-svgo": "5.2.2", + "loader-utils": "0.2.17" + }, + "dependencies": { + "file-loader": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.9.0.tgz", + "integrity": "sha1-HS2t3UJM5tGwfP4/eXMb7TYXq0I=", + "dev": true, + "requires": { + "loader-utils": "0.2.17" + } + } + } + }, + "imagemin": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/imagemin/-/imagemin-5.3.1.tgz", + "integrity": "sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=", + "dev": true, + "requires": { + "file-type": "4.4.0", + "globby": "6.1.0", + "make-dir": "1.0.0", + "p-pipe": "1.2.0", + "pify": "2.3.0", + "replace-ext": "1.0.0" + }, + "dependencies": { + "file-type": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/file-type/-/file-type-4.4.0.tgz", + "integrity": "sha1-G2AOX8ofvcboDApwxxyNul95BsU=", + "dev": true + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + } + } + }, + "imagemin-gifsicle": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/imagemin-gifsicle/-/imagemin-gifsicle-5.2.0.tgz", + "integrity": "sha512-K01m5QuPK+0en8oVhiOOAicF7KjrHlCZxS++mfLI2mV/Ksfq/Y9nCXCWDz6jRv13wwlqe5T7hXT+ji2DnLc2yQ==", + "dev": true, + "requires": { + "exec-buffer": "3.2.0", + "gifsicle": "3.0.4", + "is-gif": "1.0.0" + } + }, + "imagemin-mozjpeg": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/imagemin-mozjpeg/-/imagemin-mozjpeg-6.0.0.tgz", + "integrity": "sha1-caMqRXqhsmEXpo7u8tmxkMLlCR4=", + "dev": true, + "requires": { + "exec-buffer": "3.2.0", + "is-jpg": "1.0.0", + "mozjpeg": "4.1.1" + } + }, + "imagemin-optipng": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz", + "integrity": "sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU=", + "dev": true, + "requires": { + "exec-buffer": "3.2.0", + "is-png": "1.1.0", + "optipng-bin": "3.1.4" + } + }, + "imagemin-pngquant": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/imagemin-pngquant/-/imagemin-pngquant-5.0.1.tgz", + "integrity": "sha1-2KMp2lU6+iJrEc5i3r4Lfje0OeY=", + "dev": true, + "requires": { + "exec-buffer": "3.2.0", + "is-png": "1.1.0", + "pngquant-bin": "3.1.1" + } + }, + "imagemin-svgo": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/imagemin-svgo/-/imagemin-svgo-5.2.2.tgz", + "integrity": "sha1-UBaZ9XiXMKV5IrhzbqFcU/e1WDg=", + "dev": true, + "requires": { + "is-svg": "2.1.0", + "svgo": "0.7.2" + } + }, + "immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=" + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + }, + "in-publish": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz", + "integrity": "sha1-4g/146KvwmkDILbcVSaCqcf631E=" + }, + "indent-string": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", + "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", + "requires": { + "repeating": "2.0.1" + } + }, + "indexes-of": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", + "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", + "dev": true + }, + "indexof": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", + "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz", + "integrity": "sha1-BTfLedr1m1mhpRff9wbIbsA5Fi4=" + }, + "inline-style-prefixer": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-2.0.5.tgz", + "integrity": "sha1-wVPH6I/YT+9cYC6VqBaLJ3BnH+c=", + "requires": { + "bowser": "1.7.1", + "hyphenate-style-name": "1.0.2" + } + }, + "inquirer": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-3.2.1.tgz", + "integrity": "sha512-QgW3eiPN8gpj/K5vVpHADJJgrrF0ho/dZGylikGX7iqAdRgC9FVKYKWFLx6hZDBFcOLEoSqINYrVPeFAeG/PdA==", + "requires": { + "ansi-escapes": "2.0.0", + "chalk": "2.0.1", + "cli-cursor": "2.1.0", + "cli-width": "2.1.0", + "external-editor": "2.0.4", + "figures": "2.0.0", + "lodash": "4.17.2", + "mute-stream": "0.0.7", + "run-async": "2.3.0", + "rx-lite": "4.0.8", + "rx-lite-aggregates": "4.0.8", + "string-width": "2.1.1", + "strip-ansi": "4.0.0", + "through": "2.3.8" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "3.0.0" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "interpret": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz", + "integrity": "sha1-y8NcYu7uc/Gat7EKgBURQBr8D5A=", + "dev": true + }, + "intl-format-cache": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/intl-format-cache/-/intl-format-cache-2.0.5.tgz", + "integrity": "sha1-tITO/Lk1PzdPJd44mjzuoa8Y18k=" + }, + "intl-messageformat": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/intl-messageformat/-/intl-messageformat-1.3.0.tgz", + "integrity": "sha1-99kmre16OrGbLcYB79VOmaS9Tq4=", + "requires": { + "intl-messageformat-parser": "1.2.0" + } + }, + "intl-messageformat-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/intl-messageformat-parser/-/intl-messageformat-parser-1.2.0.tgz", + "integrity": "sha1-WQa3+VOrdHDg3IVJCXtki5kYkv8=" + }, + "intl-relativeformat": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/intl-relativeformat/-/intl-relativeformat-1.3.0.tgz", + "integrity": "sha1-iT3HB2/M04DPCRojAMOA+les5Fs=", + "requires": { + "intl-messageformat": "1.3.0" + } + }, + "invariant": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz", + "integrity": "sha1-nh9WrArNtr8wMwbzOL47IErmA2A=", + "requires": { + "loose-envify": "1.3.1" + } + }, + "invert-kv": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", + "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=" + }, + "ip-regex": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz", + "integrity": "sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=", + "dev": true + }, + "ipaddr.js": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz", + "integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA=", + "dev": true + }, + "irregular-plurals": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-1.3.0.tgz", + "integrity": "sha512-njf5A+Mxb3kojuHd1DzISjjIl+XhyzovXEOyPPSzdQozq/Lf2tN27mOrAAsxEPZxpn6I4MGzs1oo9TxXxPFpaA==", + "dev": true + }, + "is-absolute": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz", + "integrity": "sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=", + "requires": { + "is-relative": "0.1.3" + } + }, + "is-absolute-url": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", + "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", + "dev": true + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "1.9.0" + } + }, + "is-buffer": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz", + "integrity": "sha1-Hzsm72E7IUuIy8ojzGwB2Hlh7sw=" + }, + "is-builtin-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", + "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", + "requires": { + "builtin-modules": "1.1.1" + } + }, + "is-bzip2": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-bzip2/-/is-bzip2-1.0.0.tgz", + "integrity": "sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=" + }, + "is-callable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz", + "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI=", + "dev": true + }, + "is-ci": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.0.10.tgz", + "integrity": "sha1-9zkzayYyNlBhqdSCcM1WrjNpMY4=", + "requires": { + "ci-info": "1.0.0" + } + }, + "is-date-object": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", + "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "dev": true + }, + "is-directory": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", + "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", + "dev": true + }, + "is-dom": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/is-dom/-/is-dom-1.0.9.tgz", + "integrity": "sha1-SDgy1SlyBz3hK5/j9gMghw2oNw0=" + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=" + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=" + }, + "is-finite": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", + "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "1.0.1" + } + }, + "is-gif": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-gif/-/is-gif-1.0.0.tgz", + "integrity": "sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4=", + "dev": true + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-gzip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-gzip/-/is-gzip-1.0.0.tgz", + "integrity": "sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=" + }, + "is-hex-prefixed": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz", + "integrity": "sha1-fY035q135dEnFIkTxXPggtd39VQ=" + }, + "is-jpg": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-jpg/-/is-jpg-1.0.0.tgz", + "integrity": "sha1-KVnBfnNDDbOCZNp1uQ3VTy2G2hw=", + "dev": true + }, + "is-my-json-valid": { + "version": "2.16.0", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.16.0.tgz", + "integrity": "sha1-8Hndm/2uZe4gOKrorLyGqxCeNpM=", + "dev": true, + "requires": { + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" + } + }, + "is-natural-number": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-natural-number/-/is-natural-number-2.1.1.tgz", + "integrity": "sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=" + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "requires": { + "kind-of": "3.2.2" + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.0.tgz", + "integrity": "sha1-ZHdYK4IU1gI0YJRWcAO+ip6sBNw=", + "dev": true, + "requires": { + "is-path-inside": "1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.0.tgz", + "integrity": "sha1-/AbloWg/vaE95mev9xe7wQpI838=", + "dev": true, + "requires": { + "path-is-inside": "1.0.2" + } + }, + "is-plain-obj": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", + "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=" + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "3.0.1" + }, + "dependencies": { + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + } + } + }, + "is-png": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-png/-/is-png-1.1.0.tgz", + "integrity": "sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=" + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=" + }, + "is-promise": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz", + "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=" + }, + "is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", + "dev": true + }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" + }, + "is-regex": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", + "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "dev": true, + "requires": { + "has": "1.0.1" + } + }, + "is-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", + "integrity": "sha1-/S2INUXEa6xaYz57mgnof6LLUGk=" + }, + "is-relative": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz", + "integrity": "sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=" + }, + "is-resolvable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz", + "integrity": "sha1-jfV8YeouPFAUCNEA+wE8+NbgzGI=", + "dev": true, + "requires": { + "tryit": "1.0.3" + } + }, + "is-retry-allowed": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", + "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, + "is-subset": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-subset/-/is-subset-0.1.1.tgz", + "integrity": "sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY=", + "dev": true + }, + "is-supported-regexp-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-supported-regexp-flag/-/is-supported-regexp-flag-1.0.0.tgz", + "integrity": "sha1-i1IMhfrnolM4LUsCZS4EVXbhO7g=", + "dev": true + }, + "is-svg": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", + "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", + "dev": true, + "requires": { + "html-comment-regex": "1.1.1" + } + }, + "is-symbol": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", + "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", + "dev": true + }, + "is-tar": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-tar/-/is-tar-1.0.0.tgz", + "integrity": "sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=" + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" + }, + "is-url": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.2.tgz", + "integrity": "sha1-SYkFpZO/R8wtnn9zg3K792lsfyY=" + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=" + }, + "is-valid-glob": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", + "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=" + }, + "is-zip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-zip/-/is-zip-1.0.0.tgz", + "integrity": "sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=" + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "requires": { + "isarray": "1.0.0" + } + }, + "isomorphic-fetch": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz", + "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=", + "requires": { + "node-fetch": "1.7.1", + "whatwg-fetch": "2.0.1" + } + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" + }, + "istanbul": { + "version": "1.0.0-alpha.2", + "resolved": "https://registry.npmjs.org/istanbul/-/istanbul-1.0.0-alpha.2.tgz", + "integrity": "sha1-BglrwI6Yuq10Sq5Gli2N+frGPQg=", + "dev": true, + "requires": { + "abbrev": "1.0.9", + "async": "1.5.2", + "istanbul-api": "1.1.11", + "js-yaml": "3.6.1", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "which": "1.2.14", + "wordwrap": "1.0.0" + }, + "dependencies": { + "abbrev": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz", + "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=", + "dev": true + }, + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "istanbul-api": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/istanbul-api/-/istanbul-api-1.1.11.tgz", + "integrity": "sha1-/MC0YeKzvaceMFFVE4I4doJX2d4=", + "dev": true, + "requires": { + "async": "2.5.0", + "fileset": "2.0.3", + "istanbul-lib-coverage": "1.1.1", + "istanbul-lib-hook": "1.0.7", + "istanbul-lib-instrument": "1.7.4", + "istanbul-lib-report": "1.1.1", + "istanbul-lib-source-maps": "1.2.1", + "istanbul-reports": "1.1.1", + "js-yaml": "3.9.1", + "mkdirp": "0.5.1", + "once": "1.4.0" + }, + "dependencies": { + "async": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "dev": true, + "requires": { + "lodash": "4.17.2" + } + }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "js-yaml": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.9.1.tgz", + "integrity": "sha512-CbcG379L1e+mWBnLvHWWeLs8GyV/EMw862uLI3c+GxVyDHWZcjZinwuBd3iW2pgxgIlksW/1vNJa4to+RvDOww==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + } + } + }, + "istanbul-lib-coverage": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz", + "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==", + "dev": true + }, + "istanbul-lib-hook": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-1.0.7.tgz", + "integrity": "sha512-3U2HB9y1ZV9UmFlE12Fx+nPtFqIymzrqCksrXujm3NVbAZIJg/RfYgO1XiIa0mbmxTjWpVEVlkIZJ25xVIAfkQ==", + "dev": true, + "requires": { + "append-transform": "0.4.0" + } + }, + "istanbul-lib-instrument": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.4.tgz", + "integrity": "sha1-6f2SDkdn89Ge3HZeLWs/XMvQ7qg=", + "dev": true, + "requires": { + "babel-generator": "6.25.0", + "babel-template": "6.25.0", + "babel-traverse": "6.25.0", + "babel-types": "6.25.0", + "babylon": "6.17.4", + "istanbul-lib-coverage": "1.1.1", + "semver": "5.4.1" + } + }, + "istanbul-lib-report": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz", + "integrity": "sha512-tvF+YmCmH4thnez6JFX06ujIA19WPa9YUiwjc1uALF2cv5dmE3It8b5I8Ob7FHJ70H9Y5yF+TDkVa/mcADuw1Q==", + "dev": true, + "requires": { + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "path-parse": "1.0.5", + "supports-color": "3.2.3" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.1.tgz", + "integrity": "sha512-mukVvSXCn9JQvdJl8wP/iPhqig0MRtuWuD4ZNKo6vB2Ik//AmhAKe3QnPN02dmkRe3lTudFk3rzoHhwU4hb94w==", + "dev": true, + "requires": { + "debug": "2.6.8", + "istanbul-lib-coverage": "1.1.1", + "mkdirp": "0.5.1", + "rimraf": "2.6.1", + "source-map": "0.5.6" + } + }, + "istanbul-reports": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-1.1.1.tgz", + "integrity": "sha512-P8G873A0kW24XRlxHVGhMJBhQ8gWAec+dae7ZxOBzxT4w+a9ATSPvRVK3LB1RAJ9S8bg2tOyWHAGW40Zd2dKfw==", + "dev": true, + "requires": { + "handlebars": "4.0.10" + } + }, + "js-base64": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz", + "integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4=", + "dev": true + }, + "js-sha3": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/js-sha3/-/js-sha3-0.5.5.tgz", + "integrity": "sha1-uvDA6MVK1ZA0R9+Wreekobynmko=" + }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=" + }, + "js-yaml": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz", + "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "2.7.3" + } + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true + }, + "jschardet": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/jschardet/-/jschardet-1.5.0.tgz", + "integrity": "sha512-+Q8JsoEQbrdE+a/gg1F9XO92gcKXgpE5UACqr0sIubjDmBEkd+OOWPGzQeMrWSLxd73r4dHxBeRW7edHu5LmJQ==" + }, + "jsdom": { + "version": "9.11.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-9.11.0.tgz", + "integrity": "sha1-qVsDBOUhospaY8bqR793CKeoRZE=", + "dev": true, + "requires": { + "abab": "1.0.3", + "acorn": "4.0.13", + "acorn-globals": "3.1.0", + "array-equal": "1.0.0", + "content-type-parser": "1.0.1", + "cssom": "0.3.2", + "cssstyle": "0.2.37", + "escodegen": "1.8.1", + "html-encoding-sniffer": "1.0.1", + "nwmatcher": "1.4.1", + "parse5": "1.5.1", + "request": "2.81.0", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.3.2", + "webidl-conversions": "4.0.1", + "whatwg-encoding": "1.0.1", + "whatwg-url": "4.8.0", + "xml-name-validator": "2.0.1" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + } + } + }, + "jsesc": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" + }, + "json-loader": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.4.tgz", + "integrity": "sha1-i6oTZaYy9Yo8RtIBdfxgAsluN94=", + "dev": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=" + }, + "json3": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", + "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", + "dev": true + }, + "json5": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", + "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=" + }, + "jsonfile": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz", + "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "jsonfilter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/jsonfilter/-/jsonfilter-1.1.2.tgz", + "integrity": "sha1-Ie987cdRk4E8dZMulqmL4gW6WhE=", + "dev": true, + "requires": { + "JSONStream": "0.8.4", + "minimist": "1.2.0", + "stream-combiner": "0.2.2", + "through2": "0.6.5" + } + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=" + }, + "jsonparse": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-0.0.5.tgz", + "integrity": "sha1-MwVCrT8KZUZlt3jz6y2an6UHrGQ=", + "dev": true + }, + "jsonpointer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", + "dev": true + }, + "jsprim": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz", + "integrity": "sha1-o7h+QCmNjDgFUtjMdiigu5WiKRg=", + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.0.2", + "json-schema": "0.2.3", + "verror": "1.3.6" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "jsqr": { + "version": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b" + }, + "jsx-ast-utils": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz", + "integrity": "sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=", + "dev": true + }, + "keccak": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/keccak/-/keccak-1.3.0.tgz", + "integrity": "sha512-JgsKPxYhcJxKrV+TrCyg/GwZbOjhpRPrz2kG8xbAsUaIDelUlKjm08YcwBO9Fm8sqf/Kg8ZWkk6nWujhLykfvw==", + "requires": { + "bindings": "1.3.0", + "inherits": "2.0.3", + "nan": "2.6.2", + "prebuild-install": "2.2.1", + "safe-buffer": "5.1.1" + } + }, + "keycode": { + "version": "2.1.9", + "resolved": "https://registry.npmjs.org/keycode/-/keycode-2.1.9.tgz", + "integrity": "sha1-lkojxU5IiUBbSGGlyfBIDUUUHfo=" + }, + "keythereum": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/keythereum/-/keythereum-0.4.6.tgz", + "integrity": "sha1-D97Hz5OK455eMGGy9uFmd7dmxdo=", + "requires": { + "elliptic": "6.4.0", + "ethereumjs-util": "5.1.1", + "sjcl": "1.0.6", + "uuid": "3.0.0", + "validator": "4.0.2" + }, + "dependencies": { + "ethereumjs-util": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-5.1.1.tgz", + "integrity": "sha1-Ei+zjep0fcYrOuv8Nl0b1Ivktz4=", + "requires": { + "bn.js": "4.11.7", + "create-hash": "1.1.3", + "ethjs-util": "0.1.4", + "keccak": "1.3.0", + "rlp": "2.0.0", + "secp256k1": "3.3.0" + } + }, + "validator": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/validator/-/validator-4.0.2.tgz", + "integrity": "sha1-cKHCUl7EdE5AmXHBspiqaadTQlE=" + } + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.5" + } + }, + "klaw": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz", + "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11" + } + }, + "known-css-properties": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.0.6.tgz", + "integrity": "sha1-caC4/eG240McRx77w9lzP667z78=", + "dev": true + }, + "laggard": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/laggard/-/laggard-0.1.0.tgz", + "integrity": "sha1-Lv1kX38tjz0nrICAOcqGqO40EHU=", + "dev": true, + "requires": { + "minimist": "1.2.0", + "pixrem": "3.0.2", + "postcss": "5.2.17", + "postcss-color-rgba-fallback": "2.2.0", + "postcss-opacity": "3.0.0", + "postcss-pseudoelements": "3.0.0", + "postcss-reporter": "1.4.1", + "postcss-vmin": "2.0.0", + "postcss-will-change": "1.1.0", + "read-file-stdin": "0.2.1", + "write-file-stdout": "0.0.2" + }, + "dependencies": { + "postcss-opacity": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-opacity/-/postcss-opacity-3.0.0.tgz", + "integrity": "sha1-eHm8xzRAW/dKpsgcORdiBS/FWyk=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-reporter": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz", + "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "lodash": "4.17.2", + "log-symbols": "1.0.2", + "postcss": "5.2.17" + } + } + } + }, + "lazy-cache": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", + "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=" + }, + "lazy-req": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz", + "integrity": "sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=", + "dev": true + }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "requires": { + "readable-stream": "2.3.3" + } + }, + "lcid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", + "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", + "requires": { + "invert-kv": "1.0.0" + } + }, + "lcov-parse": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/lcov-parse/-/lcov-parse-0.0.10.tgz", + "integrity": "sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=", + "dev": true + }, + "ldjson-stream": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ldjson-stream/-/ldjson-stream-1.2.1.tgz", + "integrity": "sha1-kb7O2lrE7SsX5kn7d356v6AYnCs=", + "dev": true, + "requires": { + "split2": "0.2.1", + "through2": "0.6.5" + } + }, + "leven": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-2.1.0.tgz", + "integrity": "sha1-wuep93IJTe6dNCAq6KzORoeHVYA=" + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2", + "type-check": "0.3.2" + } + }, + "lie": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", + "integrity": "sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=", + "requires": { + "immediate": "3.0.6" + } + }, + "load-json-file": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", + "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", + "requires": { + "graceful-fs": "4.1.11", + "parse-json": "2.2.0", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "strip-bom": "2.0.0" + } + }, + "loader-runner": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", + "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", + "dev": true + }, + "loader-utils": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", + "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", + "requires": { + "big.js": "3.1.3", + "emojis-list": "2.1.0", + "json5": "0.5.1", + "object-assign": "4.1.1" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "2.0.0", + "path-exists": "3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + } + } + }, + "lodash": { + "version": "4.17.2", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.2.tgz", + "integrity": "sha1-NKMFW6vgTOQkZ7YH1wAHLH/2v0I=" + }, + "lodash-es": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.4.tgz", + "integrity": "sha1-3MHXVS4VCgZABzupyzHXDwMpUOc=" + }, + "lodash._baseassign": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", + "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash.keys": "3.1.2" + } + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=" + }, + "lodash._basecreate": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", + "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", + "dev": true + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=" + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=" + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=" + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=" + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=" + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=" + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=" + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=" + }, + "lodash.assign": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz", + "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=" + }, + "lodash.assignin": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz", + "integrity": "sha1-uo31+4QesKPoBEIysOJjqNxqKKI=", + "dev": true + }, + "lodash.bind": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/lodash.bind/-/lodash.bind-4.2.1.tgz", + "integrity": "sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=", + "dev": true + }, + "lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", + "dev": true + }, + "lodash.create": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", + "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", + "dev": true, + "requires": { + "lodash._baseassign": "3.2.0", + "lodash._basecreate": "3.0.3", + "lodash._isiterateecall": "3.0.9" + } + }, + "lodash.debounce": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", + "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=" + }, + "lodash.defaults": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=", + "dev": true + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "requires": { + "lodash._root": "3.0.1" + } + }, + "lodash.filter": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.filter/-/lodash.filter-4.6.0.tgz", + "integrity": "sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=", + "dev": true + }, + "lodash.flatten": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz", + "integrity": "sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=", + "dev": true + }, + "lodash.foreach": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.foreach/-/lodash.foreach-4.5.0.tgz", + "integrity": "sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=", + "dev": true + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=" + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=" + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=" + }, + "lodash.isplainobject": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha1-fFJqUtibRcRcxpC4gWO+BJf1UMs=" + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } + }, + "lodash.map": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz", + "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=", + "dev": true + }, + "lodash.memoize": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", + "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", + "dev": true + }, + "lodash.merge": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.0.tgz", + "integrity": "sha1-aYhLoUSsM/5plzemCG3v+t0PicU=" + }, + "lodash.pad": { + "version": "4.5.1", + "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.5.1.tgz", + "integrity": "sha1-QzCUmoM6fI2iLMIPaibE1Z3runA=" + }, + "lodash.padend": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz", + "integrity": "sha1-U8y6BH0G4VjTEfRdpiX05J5vFm4=" + }, + "lodash.padstart": { + "version": "4.6.1", + "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.6.1.tgz", + "integrity": "sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs=" + }, + "lodash.pick": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-4.4.0.tgz", + "integrity": "sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=", + "dev": true + }, + "lodash.pickby": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.6.0.tgz", + "integrity": "sha1-feoh2MGNdwOifHBMFdO4SmfjOv8=", + "dev": true + }, + "lodash.reduce": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz", + "integrity": "sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=", + "dev": true + }, + "lodash.reject": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.reject/-/lodash.reject-4.6.0.tgz", + "integrity": "sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=", + "dev": true + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=" + }, + "lodash.some": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/lodash.some/-/lodash.some-4.6.0.tgz", + "integrity": "sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=", + "dev": true + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" + } + }, + "lodash.throttle": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", + "integrity": "sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=" + }, + "lodash.toarray": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz", + "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE=" + }, + "lodash.uniq": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", + "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", + "dev": true + }, + "log-driver": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", + "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=", + "dev": true + }, + "log-symbols": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz", + "integrity": "sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=", + "dev": true, + "requires": { + "chalk": "1.1.3" + } + }, + "logalot": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/logalot/-/logalot-2.1.0.tgz", + "integrity": "sha1-X46MkNME7fElMJUaVVSruMXj9VI=", + "dev": true, + "requires": { + "figures": "1.7.0", + "squeak": "1.3.0" + }, + "dependencies": { + "figures": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz", + "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=", + "dev": true, + "requires": { + "escape-string-regexp": "1.0.5", + "object-assign": "4.1.1" + } + } + } + }, + "loglevel": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.4.1.tgz", + "integrity": "sha1-lbOD+Ro8J1b9SrCTZn5DCRYfK80=" + }, + "lolex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-1.3.2.tgz", + "integrity": "sha1-fD2mL/yzDw9agKJWbKJORdigHzE=", + "dev": true + }, + "longest": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", + "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=" + }, + "loose-envify": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", + "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", + "requires": { + "js-tokens": "3.0.2" + } + }, + "loud-rejection": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", + "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", + "requires": { + "currently-unhandled": "0.4.1", + "signal-exit": "3.0.2" + } + }, + "lower-case": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", + "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", + "dev": true + }, + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=" + }, + "lpad-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/lpad-align/-/lpad-align-1.1.2.tgz", + "integrity": "sha1-IfYArBwwlcPG5JfuZyce4ISB/p4=", + "dev": true, + "requires": { + "get-stdin": "4.0.1", + "indent-string": "2.1.0", + "longest": "1.0.1", + "meow": "3.7.0" + }, + "dependencies": { + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", + "dev": true + } + } + }, + "lru-cache": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz", + "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==", + "dev": true, + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "macaddress": { + "version": "0.2.8", + "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", + "integrity": "sha1-WQTcU3w57G2+/q6QIycTX6hRHxI=", + "dev": true + }, + "make-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.0.0.tgz", + "integrity": "sha1-l6ARdR6R3YfPre9Ygy67BJNt6Xg=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "map-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", + "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=" + }, + "markdown-loader": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/markdown-loader/-/markdown-loader-2.0.0.tgz", + "integrity": "sha1-Qhhi04xCJP02FetkgBfqOFtWLXg=", + "dev": true, + "requires": { + "loader-utils": "0.2.17", + "marked": "0.3.6" + } + }, + "marked": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/marked/-/marked-0.3.6.tgz", + "integrity": "sha1-ssbGGPzOzk74bE/Gy4p8v1rtqNc=" + }, + "material-ui": { + "version": "0.16.5", + "resolved": "https://registry.npmjs.org/material-ui/-/material-ui-0.16.5.tgz", + "integrity": "sha1-u4ZhqsfKyMsiOj529PV+4YpK78E=", + "requires": { + "babel-runtime": "6.23.0", + "inline-style-prefixer": "2.0.5", + "keycode": "2.1.9", + "lodash.merge": "4.6.0", + "lodash.throttle": "4.1.1", + "react-addons-create-fragment": "15.6.0", + "react-addons-transition-group": "15.6.0", + "react-event-listener": "0.4.1", + "recompose": "0.20.2", + "simple-assign": "0.1.0", + "warning": "3.0.0" + } + }, + "material-ui-chip-input": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/material-ui-chip-input/-/material-ui-chip-input-0.11.1.tgz", + "integrity": "sha1-6Sssxcl0HNddaxgi8cd3GtTObBA=" + }, + "math-expression-evaluator": { + "version": "1.2.17", + "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", + "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=" + }, + "mdurl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", + "integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4=" + }, + "media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", + "dev": true + }, + "memory-fs": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", + "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", + "dev": true, + "requires": { + "errno": "0.1.4", + "readable-stream": "2.3.3" + } + }, + "memorystream": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/memorystream/-/memorystream-0.3.1.tgz", + "integrity": "sha1-htcJCzDORV1j+64S3aUaR93K+bI=" + }, + "meow": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", + "requires": { + "camelcase-keys": "2.1.0", + "decamelize": "1.2.0", + "loud-rejection": "1.6.0", + "map-obj": "1.0.1", + "minimist": "1.2.0", + "normalize-package-data": "2.4.0", + "object-assign": "4.1.1", + "read-pkg-up": "1.0.1", + "redent": "1.0.0", + "trim-newlines": "1.0.0" + } + }, + "merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", + "dev": true + }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "requires": { + "readable-stream": "2.3.3" + } + }, + "methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", + "dev": true + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.3" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "miller-rabin": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.0.tgz", + "integrity": "sha1-SmL7HUKTPAVYOYL0xxb2+55sbT0=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "brorand": "1.1.0" + } + }, + "mime": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz", + "integrity": "sha1-EV+eO2s9rylZmDyzjxSaLUDrXVM=", + "dev": true + }, + "mime-db": { + "version": "1.29.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.29.0.tgz", + "integrity": "sha1-SNJtI1WJZRcErFkWygYAGRQmaHg=" + }, + "mime-types": { + "version": "2.1.16", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.16.tgz", + "integrity": "sha1-K4WKUuXs1RbbiXrCvodIeDBpjiM=", + "requires": { + "mime-db": "1.29.0" + } + }, + "mimic-fn": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz", + "integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg=" + }, + "min-document": { + "version": "2.19.0", + "resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz", + "integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=", + "dev": true, + "requires": { + "dom-walk": "0.1.1" + } + }, + "minimalistic-assert": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz", + "integrity": "sha1-cCvi3aazf0g2vLP121ZkG2Sh09M=" + }, + "minimalistic-crypto-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", + "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=" + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "requires": { + "minimist": "0.0.8" + }, + "dependencies": { + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + } + } + }, + "mobx": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/mobx/-/mobx-2.6.4.tgz", + "integrity": "sha1-4FqRpbLJfaw/2rNAJOa3Sn9DEas=" + }, + "mobx-react": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/mobx-react/-/mobx-react-4.0.3.tgz", + "integrity": "sha1-QOsx0l4LjWMEjtojdsxWv6vRT3U=", + "requires": { + "hoist-non-react-statics": "1.2.0" + } + }, + "mobx-react-devtools": { + "version": "4.2.10", + "resolved": "https://registry.npmjs.org/mobx-react-devtools/-/mobx-react-devtools-4.2.10.tgz", + "integrity": "sha1-eSdL2NRLoE2VByhzihRFQfoqYBI=" + }, + "mocha": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz", + "integrity": "sha1-fcT0XlCIB1FxpoiWgU5q6et6heM=", + "dev": true, + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.9.0", + "debug": "2.2.0", + "diff": "1.4.0", + "escape-string-regexp": "1.0.5", + "glob": "7.0.5", + "growl": "1.9.2", + "json3": "3.3.2", + "lodash.create": "3.1.1", + "mkdirp": "0.5.1", + "supports-color": "3.1.2" + }, + "dependencies": { + "commander": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", + "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", + "dev": true, + "requires": { + "graceful-readlink": "1.0.1" + } + }, + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + } + }, + "glob": { + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.5.tgz", + "integrity": "sha1-tCAqaQmbu00pKnwblbZoK2fr3JU=", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + }, + "supports-color": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", + "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "mock-local-storage": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/mock-local-storage/-/mock-local-storage-1.0.2.tgz", + "integrity": "sha1-plplzdq0cHQz1Suk6fa2MIS4wpg=", + "dev": true, + "requires": { + "core-js": "0.8.4" + }, + "dependencies": { + "core-js": { + "version": "0.8.4", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-0.8.4.tgz", + "integrity": "sha1-wiZl8eDRucPF4bCNq9HxCGleT88=", + "dev": true + } + } + }, + "mock-socket": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/mock-socket/-/mock-socket-6.0.4.tgz", + "integrity": "sha1-hfWKCqg7wdtMp9FLQtj53WY+dWk=", + "dev": true + }, + "moment": { + "version": "2.17.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.17.0.tgz", + "integrity": "sha1-pMKS4CqsXd77Kabu0k9Rk43Tt08=" + }, + "mozjpeg": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/mozjpeg/-/mozjpeg-4.1.1.tgz", + "integrity": "sha1-hZAwsk9omlPbm0DwFg2JGVuI/VA=", + "dev": true, + "requires": { + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + }, + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "requires": { + "duplexer2": "0.0.2" + }, + "dependencies": { + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "requires": { + "readable-stream": "1.1.14" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + } + } + }, + "mute-stream": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz", + "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=" + }, + "nan": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.6.2.tgz", + "integrity": "sha1-5P805slf37WuzAjeZZb0NgWn20U=" + }, + "napa": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/napa/-/napa-2.3.0.tgz", + "integrity": "sha1-QZZUbRoLa7lPNwQgU8xd3XlzHlM=", + "requires": { + "download": "4.4.3", + "extend": "3.0.1", + "load-json-file": "1.1.0", + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "npm-cache-filename": "1.0.2", + "npmlog": "2.0.4", + "rimraf": "2.6.1", + "tar-pack": "3.4.0", + "write-json-file": "1.2.0" + }, + "dependencies": { + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "gauge": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/gauge/-/gauge-1.2.7.tgz", + "integrity": "sha1-6c7FSD09TuDvRLYKfZnkk14TbZM=", + "requires": { + "ansi": "0.3.1", + "has-unicode": "2.0.1", + "lodash.pad": "4.5.1", + "lodash.padend": "4.6.1", + "lodash.padstart": "4.6.1" + } + }, + "npmlog": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz", + "integrity": "sha1-mLUlMPJRTKkNCexbIsiEZyI3VpI=", + "requires": { + "ansi": "0.3.1", + "are-we-there-yet": "1.1.4", + "gauge": "1.2.7" + } + } + } + }, + "native-promise-only": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/native-promise-only/-/native-promise-only-0.8.1.tgz", + "integrity": "sha1-IKMYwwy0X3H+et+/eyHJnBRy7xE=", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=", + "dev": true + }, + "ncname": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ncname/-/ncname-1.0.0.tgz", + "integrity": "sha1-W1etGLHKCShk72Kwse2BlPODtxw=", + "dev": true, + "requires": { + "xml-char-classes": "1.0.0" + } + }, + "negotiator": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", + "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", + "dev": true + }, + "no-case": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.1.tgz", + "integrity": "sha1-euuhxzpSGEJlVUt9wDuvcg34AIE=", + "dev": true, + "requires": { + "lower-case": "1.1.4" + } + }, + "nock": { + "version": "9.0.7", + "resolved": "https://registry.npmjs.org/nock/-/nock-9.0.7.tgz", + "integrity": "sha1-zJNIG7FfOL7Co5xEQr4HglI1saE=", + "dev": true, + "requires": { + "chai": "3.5.0", + "debug": "2.6.8", + "deep-equal": "1.0.1", + "json-stringify-safe": "5.0.1", + "lodash": "4.17.2", + "mkdirp": "0.5.1", + "propagate": "0.4.0", + "qs": "6.3.0" + } + }, + "node-abi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.1.0.tgz", + "integrity": "sha512-AbW35CPRE4vdieOse46V+16dKispLNv3PQwgqlcfg7GQeQHcLu3gvp3fbU2gTh7d8NfGjp5CJh+j4Hpyb0XzaA==" + }, + "node-dir": { + "version": "0.1.17", + "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz", + "integrity": "sha1-X1Zl2TNRM1yqvvjxxVRRbPXx5OU=", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "node-emoji": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.8.1.tgz", + "integrity": "sha512-+ktMAh1Jwas+TnGodfCfjUbJKoANqPaJFN0z0iqh41eqD8dvguNzcitVSBSVK1pidz0AqGbLKcoVuVLRVZ/aVg==", + "requires": { + "lodash.toarray": "4.4.0" + } + }, + "node-fetch": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.1.tgz", + "integrity": "sha512-j8XsFGCLw79vWXkZtMSmmLaOk9z5SQ9bV/tkbZVCqvgwzrjAGq66igobLofHtF63NvMTp2WjytpsNTGKa+XRIQ==", + "requires": { + "encoding": "0.1.12", + "is-stream": "1.1.0" + } + }, + "node-gyp": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.6.2.tgz", + "integrity": "sha1-m/vlRWIoYoSDjnUOrAUpWFP6HGA=", + "requires": { + "fstream": "1.0.11", + "glob": "7.1.2", + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "nopt": "3.0.6", + "npmlog": "4.1.2", + "osenv": "0.1.4", + "request": "2.81.0", + "rimraf": "2.6.1", + "semver": "5.3.0", + "tar": "2.2.1", + "which": "1.2.14" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "semver": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz", + "integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8=" + } + } + }, + "node-libs-browser": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.0.0.tgz", + "integrity": "sha1-o6WeyXAkmFtG6Vg3lkb5bEthZkY=", + "dev": true, + "requires": { + "assert": "1.4.1", + "browserify-zlib": "0.1.4", + "buffer": "4.9.1", + "console-browserify": "1.1.0", + "constants-browserify": "1.0.0", + "crypto-browserify": "3.11.1", + "domain-browser": "1.1.7", + "events": "1.1.1", + "https-browserify": "0.0.1", + "os-browserify": "0.2.1", + "path-browserify": "0.0.0", + "process": "0.11.10", + "punycode": "1.4.1", + "querystring-es3": "0.2.1", + "readable-stream": "2.3.3", + "stream-browserify": "2.0.1", + "stream-http": "2.7.2", + "string_decoder": "0.10.31", + "timers-browserify": "2.0.3", + "tty-browserify": "0.0.0", + "url": "0.11.0", + "util": "0.10.3", + "vm-browserify": "0.0.4" + }, + "dependencies": { + "process": { + "version": "0.11.10", + "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", + "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", + "dev": true + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "node-status-codes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz", + "integrity": "sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=" + }, + "noop-logger": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/noop-logger/-/noop-logger-0.1.1.tgz", + "integrity": "sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=" + }, + "nopt": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz", + "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=", + "requires": { + "abbrev": "1.1.0" + } + }, + "normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", + "requires": { + "hosted-git-info": "2.5.0", + "is-builtin-module": "1.0.0", + "semver": "5.4.1", + "validate-npm-package-license": "3.0.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "requires": { + "remove-trailing-separator": "1.0.2" + } + }, + "normalize-range": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", + "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", + "dev": true + }, + "normalize-selector": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz", + "integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=", + "dev": true + }, + "normalize-url": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", + "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "prepend-http": "1.0.4", + "query-string": "4.3.4", + "sort-keys": "1.1.2" + } + }, + "npm-cache-filename": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz", + "integrity": "sha1-3tMGxbC/yHCp6fr4I7xfKD4FrhE=" + }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "dev": true, + "requires": { + "path-key": "2.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", + "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", + "requires": { + "are-we-there-yet": "1.1.4", + "console-control-strings": "1.1.0", + "gauge": "2.7.4", + "set-blocking": "2.0.0" + } + }, + "nth-check": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", + "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", + "dev": true, + "requires": { + "boolbase": "1.0.0" + } + }, + "num2fraction": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", + "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", + "dev": true + }, + "number-is-nan": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", + "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" + }, + "nwmatcher": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.1.tgz", + "integrity": "sha1-eumwew6oBNt+JfBctf5Al9TklJ8=", + "dev": true + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" + }, + "object-is": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz", + "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=", + "dev": true + }, + "object-keys": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz", + "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0=", + "dev": true + }, + "object-path": { + "version": "0.11.4", + "resolved": "https://registry.npmjs.org/object-path/-/object-path-0.11.4.tgz", + "integrity": "sha1-NwrnUvvzfePqcKhhwju6iRVpGUk=" + }, + "object.assign": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.0.4.tgz", + "integrity": "sha1-scnMBE7xuf5jYG/BQau7MuFHMMw=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "function-bind": "1.1.0", + "object-keys": "1.0.11" + } + }, + "object.entries": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.0.4.tgz", + "integrity": "sha1-G/mk3SKI9bM/Opk9JXZh8F0WGl8=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.7.0", + "function-bind": "1.1.0", + "has": "1.0.1" + } + }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "object.values": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.0.4.tgz", + "integrity": "sha1-5STaCbT2b/Bd9FdUbscqyZ8TBpo=", + "dev": true, + "requires": { + "define-properties": "1.1.2", + "es-abstract": "1.7.0", + "function-bind": "1.1.0", + "has": "1.0.1" + } + }, + "on-finished": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", + "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", + "dev": true, + "requires": { + "ee-first": "1.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "requires": { + "wrappy": "1.0.2" + } + }, + "onecolor": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/onecolor/-/onecolor-3.0.4.tgz", + "integrity": "sha1-daRvgNpseqpbTarhekcZi9llJJQ=", + "dev": true + }, + "onetime": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=" + }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "0.0.10", + "wordwrap": "0.0.2" + }, + "dependencies": { + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", + "dev": true + } + } + }, + "optionator": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", + "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "dev": true, + "requires": { + "deep-is": "0.1.3", + "fast-levenshtein": "2.0.6", + "levn": "0.3.0", + "prelude-ls": "1.1.2", + "type-check": "0.3.2", + "wordwrap": "1.0.0" + }, + "dependencies": { + "wordwrap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", + "dev": true + } + } + }, + "optipng-bin": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/optipng-bin/-/optipng-bin-3.1.4.tgz", + "integrity": "sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=", + "dev": true, + "requires": { + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" + } + }, + "ordered-read-streams": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + } + }, + "os-browserify": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.2.1.tgz", + "integrity": "sha1-Y/xMzuXS13Y9Jrv4YBB45sLgBE8=", + "dev": true + }, + "os-filter-obj": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/os-filter-obj/-/os-filter-obj-1.0.3.tgz", + "integrity": "sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60=", + "dev": true + }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-locale": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", + "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", + "requires": { + "lcid": "1.0.0" + } + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "output-file-sync": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/output-file-sync/-/output-file-sync-1.1.2.tgz", + "integrity": "sha1-0KM+7+YaIF+suQCS6CZZjVJFznY=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "object-assign": "4.1.1" + } + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", + "dev": true + }, + "p-limit": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.1.0.tgz", + "integrity": "sha1-sH/y2aXYi+yAYDWJWiurZqJ5iLw=", + "dev": true + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "1.1.0" + } + }, + "p-pipe": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/p-pipe/-/p-pipe-1.2.0.tgz", + "integrity": "sha1-SxoROZoRUgpneQ7loMHViB1r7+k=", + "dev": true + }, + "pako": { + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=", + "dev": true + }, + "param-case": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", + "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", + "dev": true, + "requires": { + "no-case": "2.3.1" + } + }, + "parse-asn1": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.0.tgz", + "integrity": "sha1-N8T5t+06tlx0gXtfJICTf7+XxxI=", + "dev": true, + "requires": { + "asn1.js": "4.9.1", + "browserify-aes": "1.0.6", + "create-hash": "1.1.3", + "evp_bytestokey": "1.0.0", + "pbkdf2": "3.0.12" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=" + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "requires": { + "error-ex": "1.3.1" + } + }, + "parse5": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz", + "integrity": "sha1-m387DeMr543CQBsXVzzK8Pb1nZQ=", + "dev": true + }, + "parseurl": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz", + "integrity": "sha1-yKuMkiO6NIiKpkopeyiFO+wY2lY=", + "dev": true + }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + }, + "path-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", + "dev": true + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=" + }, + "path-exists": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", + "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", + "requires": { + "pinkie-promise": "2.0.1" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", + "dev": true + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "dev": true + }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, + "path-to-regexp": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", + "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "requires": { + "isarray": "0.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + } + } + }, + "path-type": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", + "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", + "requires": { + "graceful-fs": "4.1.11", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "pbkdf2": { + "version": "3.0.12", + "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.12.tgz", + "integrity": "sha1-vjZ4XFBn6kjYBv+SMojF91C2uKI=", + "dev": true, + "requires": { + "create-hash": "1.1.3", + "create-hmac": "1.1.6", + "ripemd160": "2.0.1", + "safe-buffer": "5.1.1", + "sha.js": "2.4.8" + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=" + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" + }, + "phoneformat.js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/phoneformat.js/-/phoneformat.js-1.0.3.tgz", + "integrity": "sha1-Eb40dOdkdFQP43NMwz8aZYQdX4c=" + }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "requires": { + "pinkie": "2.0.4" + } + }, + "pipetteur": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/pipetteur/-/pipetteur-2.0.3.tgz", + "integrity": "sha1-GVV2CVno0aEcsqUOyD7sRwYz5J8=", + "dev": true, + "requires": { + "onecolor": "3.0.4", + "synesthesia": "1.0.1" + } + }, + "pixrem": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pixrem/-/pixrem-3.0.2.tgz", + "integrity": "sha1-MNG6+0w73Ojpu0vVahOYVhkyDDQ=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "postcss": "5.2.17", + "reduce-css-calc": "1.3.0" + } + }, + "pkg-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-1.0.0.tgz", + "integrity": "sha1-ektQio1bstYp1EcFb/TpyTFM89Q=", + "dev": true, + "requires": { + "find-up": "1.1.2" + } + }, + "plur": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/plur/-/plur-2.1.2.tgz", + "integrity": "sha1-dIJFLBoPUI4+NE6uwxLJHCncZVo=", + "dev": true, + "requires": { + "irregular-plurals": "1.3.0" + } + }, + "pluralize": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz", + "integrity": "sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=", + "dev": true + }, + "pngquant-bin": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/pngquant-bin/-/pngquant-bin-3.1.1.tgz", + "integrity": "sha1-0STZinWpSH9AwWQLTb/Lsr1aH9E=", + "dev": true, + "requires": { + "bin-build": "2.2.0", + "bin-wrapper": "3.0.2", + "logalot": "2.1.0" + } + }, + "postcss": { + "version": "5.2.17", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.17.tgz", + "integrity": "sha1-z09Ze4ZNZcikkrLqvp1wbIecOIs=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "js-base64": "2.1.9", + "source-map": "0.5.6", + "supports-color": "3.2.3" + }, + "dependencies": { + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "postcss-alias": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postcss-alias/-/postcss-alias-1.0.0.tgz", + "integrity": "sha1-Bwxh7hGXr27l63XSat9IiZudL3s=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-calc": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", + "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-message-helpers": "2.0.0", + "reduce-css-calc": "1.3.0" + } + }, + "postcss-clearfix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postcss-clearfix/-/postcss-clearfix-1.0.0.tgz", + "integrity": "sha1-r+xqDgHSXaw2pUrbif/Uv+HSGa8=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-color-rgba-fallback": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/postcss-color-rgba-fallback/-/postcss-color-rgba-fallback-2.2.0.tgz", + "integrity": "sha1-bSlJG+WZCpMXPUfnx29YELCUAro=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "rgb-hex": "1.0.0" + } + }, + "postcss-colormin": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", + "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", + "dev": true, + "requires": { + "colormin": "1.1.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-convert-values": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", + "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-discard-comments": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", + "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-discard-duplicates": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", + "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-discard-empty": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", + "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-discard-overridden": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", + "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-discard-unused": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", + "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "uniqs": "2.0.0" + } + }, + "postcss-easings": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/postcss-easings/-/postcss-easings-0.3.0.tgz", + "integrity": "sha1-I9zL+XWH4o1doZw7rktQaYxarV4=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-filter-plugins": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.2.tgz", + "integrity": "sha1-bYWGJTTXNaxCDkqFgG4fXUKG2Ew=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "uniqid": "4.1.1" + } + }, + "postcss-fontpath": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/postcss-fontpath/-/postcss-fontpath-0.3.0.tgz", + "integrity": "sha1-KBQqed0Y8snwv1yH96PreUxTkp4=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.17" + } + }, + "postcss-hexrgba": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/postcss-hexrgba/-/postcss-hexrgba-0.2.1.tgz", + "integrity": "sha1-XGGrukOcCjjknn+8CzzZNhGewiU=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-import": { + "version": "9.1.0", + "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-9.1.0.tgz", + "integrity": "sha1-lf6YdqHnmvSfvcNYnwH+WqfMHoA=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "promise-each": "2.2.0", + "read-cache": "1.0.0", + "resolve": "1.4.0" + } + }, + "postcss-input-style": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/postcss-input-style/-/postcss-input-style-0.3.0.tgz", + "integrity": "sha1-47T9sKpEG+0ZMMu0TYrVY0zzhUA=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-less": { + "version": "0.14.0", + "resolved": "https://registry.npmjs.org/postcss-less/-/postcss-less-0.14.0.tgz", + "integrity": "sha1-xjGwicbM5CK5oQ86lY0r7dOBkyQ=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-load-config": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", + "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1", + "postcss-load-options": "1.2.0", + "postcss-load-plugins": "2.3.0" + } + }, + "postcss-load-options": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", + "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" + } + }, + "postcss-load-plugins": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", + "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", + "dev": true, + "requires": { + "cosmiconfig": "2.2.2", + "object-assign": "4.1.1" + } + }, + "postcss-loader": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-1.3.2.tgz", + "integrity": "sha1-xWi2HC5I4nThwiSiWH+1ZvTsJvU=", + "dev": true, + "requires": { + "loader-utils": "1.1.0", + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-load-config": "1.2.0" + }, + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "dev": true, + "requires": { + "big.js": "3.1.3", + "emojis-list": "2.1.0", + "json5": "0.5.1" + } + } + } + }, + "postcss-media-query-parser": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz", + "integrity": "sha1-J7Ocb02U+Bsac7j3Y1HGCeXO8kQ=", + "dev": true + }, + "postcss-merge-idents": { + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", + "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-merge-longhand": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", + "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-merge-rules": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", + "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "caniuse-api": "1.6.1", + "postcss": "5.2.17", + "postcss-selector-parser": "2.2.3", + "vendors": "1.0.1" + } + }, + "postcss-message-helpers": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", + "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", + "dev": true + }, + "postcss-minify-font-values": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", + "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", + "dev": true, + "requires": { + "object-assign": "4.1.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-minify-gradients": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", + "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-minify-params": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", + "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "uniqs": "2.0.0" + } + }, + "postcss-minify-selectors": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", + "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-selector-parser": "2.2.3" + } + }, + "postcss-modules-extract-imports": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz", + "integrity": "sha1-thTJcgvmgW6u41+zpfqh26agXds=", + "dev": true, + "requires": { + "postcss": "6.0.8" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + }, + "postcss": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", + "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", + "dev": true, + "requires": { + "chalk": "2.0.1", + "source-map": "0.5.6", + "supports-color": "4.2.1" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-modules-local-by-default": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", + "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", + "dev": true, + "requires": { + "css-selector-tokenizer": "0.7.0", + "postcss": "6.0.8" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + }, + "postcss": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", + "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", + "dev": true, + "requires": { + "chalk": "2.0.1", + "source-map": "0.5.6", + "supports-color": "4.2.1" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-modules-scope": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", + "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", + "dev": true, + "requires": { + "css-selector-tokenizer": "0.7.0", + "postcss": "6.0.8" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + }, + "postcss": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", + "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", + "dev": true, + "requires": { + "chalk": "2.0.1", + "source-map": "0.5.6", + "supports-color": "4.2.1" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-modules-values": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", + "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", + "dev": true, + "requires": { + "icss-replace-symbols": "1.1.0", + "postcss": "6.0.8" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.0" + } + }, + "chalk": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.0.1.tgz", + "integrity": "sha512-Mp+FXEI+FrwY/XYV45b2YD3E8i3HwnEAoFcM0qlZzq/RZ9RwWitt2Y/c7cqRAz70U7hfekqx6qNYthuKFO6K0g==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.2.1" + } + }, + "postcss": { + "version": "6.0.8", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.8.tgz", + "integrity": "sha512-G6WnRmdTt2jvJvY+aY+M0AO4YlbxE+slKPZb+jG2P2U9Tyxi3h1fYZ/DgiFU6DC6bv3XIEJoZt+f/kNh8BrWFw==", + "dev": true, + "requires": { + "chalk": "2.0.1", + "source-map": "0.5.6", + "supports-color": "4.2.1" + } + }, + "supports-color": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.2.1.tgz", + "integrity": "sha512-qxzYsob3yv6U+xMzPrv170y8AwGP7i74g+pbixCfD6rgso8BscLT2qXIuz6TpOaiJZ3mFgT5O9lyT9nMU4LfaA==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "postcss-nested": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-1.0.0.tgz", + "integrity": "sha1-0Ta9S1dr1WMt8ULBKyGYqcz3lN8=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-normalize-charset": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", + "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-normalize-url": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", + "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", + "dev": true, + "requires": { + "is-absolute-url": "2.1.0", + "normalize-url": "1.9.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-opacity": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-opacity/-/postcss-opacity-4.0.0.tgz", + "integrity": "sha1-qlYgQ9ozlMlKOs7c9D8MMj0JhqE=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-ordered-values": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", + "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-position": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/postcss-position/-/postcss-position-0.5.0.tgz", + "integrity": "sha1-hlPU8LhP+wflRPt/fq4IxlUbc6A=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-pseudoelements": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-pseudoelements/-/postcss-pseudoelements-3.0.0.tgz", + "integrity": "sha1-bGghd8eQC6BTtt8X+MWQKEx7i7w=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-quantity-queries": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/postcss-quantity-queries/-/postcss-quantity-queries-0.4.0.tgz", + "integrity": "sha1-vhNwp76TEqFzY5wIaapCECRPhs4=", + "dev": true, + "requires": { + "balanced-match": "0.2.1", + "postcss": "5.2.17" + }, + "dependencies": { + "balanced-match": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.2.1.tgz", + "integrity": "sha1-e8ZYtL7WHu5CStdPdfXD4sTfPMc=", + "dev": true + } + } + }, + "postcss-reduce-idents": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", + "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", + "dev": true, + "requires": { + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-reduce-initial": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", + "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-reduce-transforms": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", + "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0" + } + }, + "postcss-reporter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-2.0.0.tgz", + "integrity": "sha1-0l50un/OkR4qpy7BrlkvrebsNnE=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "lodash": "4.17.2", + "log-symbols": "1.0.2", + "postcss": "5.2.17" + } + }, + "postcss-resolve-nested-selector": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz", + "integrity": "sha1-Kcy8fDfe36wwTp//C/FZaz9qDk4=", + "dev": true + }, + "postcss-responsive-type": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/postcss-responsive-type/-/postcss-responsive-type-0.5.1.tgz", + "integrity": "sha1-J0EzvARjWeVCpYu8YhhH0ED9EOY=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-scss": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/postcss-scss/-/postcss-scss-0.4.1.tgz", + "integrity": "sha1-rXcbgfD3L19IRdCKpg+TVXZT1Uw=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-selector-parser": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", + "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", + "dev": true, + "requires": { + "flatten": "1.0.2", + "indexes-of": "1.0.1", + "uniq": "1.0.1" + } + }, + "postcss-simple-vars": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-simple-vars/-/postcss-simple-vars-3.0.0.tgz", + "integrity": "sha1-H6TMtLcVHZ8NUvuOoZoVwTGVmdY=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-svgo": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", + "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", + "dev": true, + "requires": { + "is-svg": "2.1.0", + "postcss": "5.2.17", + "postcss-value-parser": "3.3.0", + "svgo": "0.7.2" + } + }, + "postcss-unique-selectors": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", + "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", + "dev": true, + "requires": { + "alphanum-sort": "1.0.2", + "postcss": "5.2.17", + "uniqs": "2.0.0" + } + }, + "postcss-value-parser": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", + "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", + "dev": true + }, + "postcss-vmin": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/postcss-vmin/-/postcss-vmin-2.0.0.tgz", + "integrity": "sha1-UyfCEZE3ElaGj9enOZF/FHTVf+4=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-will-change": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/postcss-will-change/-/postcss-will-change-1.1.0.tgz", + "integrity": "sha1-plHdWoHoLEEtOabPkKkrsyaa8Yw=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "postcss-zindex": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", + "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", + "dev": true, + "requires": { + "has": "1.0.1", + "postcss": "5.2.17", + "uniqs": "2.0.0" + } + }, + "prebuild-install": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-2.2.1.tgz", + "integrity": "sha512-y/sgNJ49vjXQ3qYdSI/jTRZq6D7g5Q2euK6x0/L8dvwK1EGvNLidtg2t4PZzTgkR6LahkzpYVshOmHKYtp0AlQ==", + "requires": { + "expand-template": "1.0.3", + "github-from-package": "0.0.0", + "minimist": "1.2.0", + "mkdirp": "0.5.1", + "node-abi": "2.1.0", + "noop-logger": "0.1.1", + "npmlog": "4.1.2", + "os-homedir": "1.0.2", + "pump": "1.0.2", + "rc": "1.2.1", + "simple-get": "1.4.3", + "tar-fs": "1.15.3", + "tunnel-agent": "0.6.0", + "xtend": "4.0.1" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=" + }, + "pretty-error": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", + "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", + "dev": true, + "requires": { + "renderkid": "2.0.1", + "utila": "0.4.0" + } + }, + "private": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/private/-/private-0.1.7.tgz", + "integrity": "sha1-aM5eih7woju1cMwoU3tTMqumPvE=" + }, + "process": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz", + "integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + }, + "progress": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz", + "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=", + "dev": true + }, + "progress-bar-webpack-plugin": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/progress-bar-webpack-plugin/-/progress-bar-webpack-plugin-1.9.3.tgz", + "integrity": "sha1-gfuL2OONpu2vmiC+7Xm9l43WPCo=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "object.assign": "4.0.4", + "progress": "1.1.8" + } + }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "2.0.6" + } + }, + "promise-each": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/promise-each/-/promise-each-2.2.0.tgz", + "integrity": "sha1-M1MXTv8mlEgQN+BOAfd6oPttG2A=", + "dev": true, + "requires": { + "any-promise": "0.1.0" + } + }, + "promise-worker": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/promise-worker/-/promise-worker-1.1.1.tgz", + "integrity": "sha1-wrddBF0kliXAImTi3/mtIuAxxps=", + "requires": { + "is-promise": "2.1.0", + "lie": "3.1.1" + } + }, + "prop-types": { + "version": "15.5.10", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.5.10.tgz", + "integrity": "sha1-J5ffwxJhguOpXj37suiT3ddFYVQ=", + "requires": { + "fbjs": "0.8.14", + "loose-envify": "1.3.1" + } + }, + "propagate": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/propagate/-/propagate-0.4.0.tgz", + "integrity": "sha1-8/zKCm/gZzanulcpZgaWF8EwtIE=", + "dev": true + }, + "proper-lockfile": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/proper-lockfile/-/proper-lockfile-2.0.1.tgz", + "integrity": "sha1-FZ+wYZPTIAP0s2kd0uwaY0qoDR0=", + "requires": { + "graceful-fs": "4.1.11", + "retry": "0.10.1" + } + }, + "proxy-addr": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz", + "integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=", + "dev": true, + "requires": { + "forwarded": "0.1.0", + "ipaddr.js": "1.4.0" + } + }, + "prr": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz", + "integrity": "sha1-GoS4WQgyVQFBGFPQCB7j+obikmo=", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", + "dev": true + }, + "public-encrypt": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.0.tgz", + "integrity": "sha1-OfaZ86RlYN1eusvKaTyvfGXBjMY=", + "dev": true, + "requires": { + "bn.js": "4.11.7", + "browserify-rsa": "4.0.1", + "create-hash": "1.1.3", + "parse-asn1": "5.1.0", + "randombytes": "2.0.5" + } + }, + "pump": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-1.0.2.tgz", + "integrity": "sha1-Oz7mUS+U8OV1U4wXmV+fFpkKXVE=", + "requires": { + "end-of-stream": "1.4.0", + "once": "1.4.0" + } + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "push.js": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/push.js/-/push.js-0.0.11.tgz", + "integrity": "sha1-T606n5CEQhLiqmfQc6I9Rw4yqJE=" + }, + "q": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/q/-/q-1.5.0.tgz", + "integrity": "sha1-3QG6ydBtMObyGa7LglPunr3DCPE=", + "dev": true + }, + "qs": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.0.tgz", + "integrity": "sha1-9AOyZPI7wBIox0ExtAfxjV6l1EI=" + }, + "query-string": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", + "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", + "requires": { + "object-assign": "4.1.1", + "strict-uri-encode": "1.1.0" + } + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", + "dev": true + }, + "querystring-es3": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", + "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", + "dev": true + }, + "raf": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz", + "integrity": "sha1-DBO+C1tJtG921maSSNUnzysC/ic=", + "requires": { + "performance-now": "2.1.0" + } + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "1.1.5" + } + } + } + }, + "randombytes": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz", + "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "range-parser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", + "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", + "dev": true + }, + "raw-loader": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/raw-loader/-/raw-loader-0.5.1.tgz", + "integrity": "sha1-DD0L6u2KAclm2Xh793goElKpeao=", + "dev": true + }, + "rc": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.1.tgz", + "integrity": "sha1-LgPo5C7kULjLPc5lvhv4l04d/ZU=", + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.4", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + } + }, + "react": { + "version": "15.4.2", + "resolved": "https://registry.npmjs.org/react/-/react-15.4.2.tgz", + "integrity": "sha1-QfeZGyYYU5K6m66WyIiefgGDl+8=", + "requires": { + "fbjs": "0.8.14", + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, + "react-ace": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/react-ace/-/react-ace-4.1.0.tgz", + "integrity": "sha1-ZZ+qAQ0XP2DWqJQPCzJcXkIsq1Q=", + "requires": { + "brace": "0.8.0", + "lodash.isequal": "4.5.0" + }, + "dependencies": { + "brace": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/brace/-/brace-0.8.0.tgz", + "integrity": "sha1-6CbG1QVMrl9getexyBI23SzwGXg=", + "requires": { + "w3c-blob": "0.0.1" + } + } + } + }, + "react-addons-create-fragment": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/react-addons-create-fragment/-/react-addons-create-fragment-15.6.0.tgz", + "integrity": "sha1-r5GiKx+wld0B8a+6Q7/Q71idiyA=", + "requires": { + "fbjs": "0.8.14", + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, + "react-addons-css-transition-group": { + "version": "15.4.2", + "resolved": "https://registry.npmjs.org/react-addons-css-transition-group/-/react-addons-css-transition-group-15.4.2.tgz", + "integrity": "sha1-t4KINN+hQin+B3UOMx6KjLb7d0U=", + "requires": { + "fbjs": "0.8.14", + "object-assign": "4.1.1" + } + }, + "react-addons-perf": { + "version": "15.4.2", + "resolved": "https://registry.npmjs.org/react-addons-perf/-/react-addons-perf-15.4.2.tgz", + "integrity": "sha1-EQvc9cRZxPd8uF7WNLzTOXU2ODs=", + "dev": true, + "requires": { + "fbjs": "0.8.14", + "object-assign": "4.1.1" + } + }, + "react-addons-shallow-compare": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/react-addons-shallow-compare/-/react-addons-shallow-compare-15.6.0.tgz", + "integrity": "sha1-t6Tl/58nBMIM9obdigXdCLJt4lI=", + "requires": { + "fbjs": "0.8.14", + "object-assign": "4.1.1" + } + }, + "react-addons-test-utils": { + "version": "15.4.2", + "resolved": "https://registry.npmjs.org/react-addons-test-utils/-/react-addons-test-utils-15.4.2.tgz", + "integrity": "sha1-k7yqcY/K5zYNQuj7HAl1bMNjAqI=", + "dev": true, + "requires": { + "fbjs": "0.8.14", + "object-assign": "4.1.1" + } + }, + "react-addons-transition-group": { + "version": "15.6.0", + "resolved": "https://registry.npmjs.org/react-addons-transition-group/-/react-addons-transition-group-15.6.0.tgz", + "integrity": "sha1-DyILn5WX2zqAqI29b+gF/GRM4hw=", + "requires": { + "react-transition-group": "1.2.0" + } + }, + "react-codemirror": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/react-codemirror/-/react-codemirror-0.3.0.tgz", + "integrity": "sha1-zWvW70WOweA1z9iz/nswyMeIPGw=", + "requires": { + "classnames": "2.2.5", + "codemirror": "5.28.0", + "lodash.debounce": "4.0.8" + } + }, + "react-container-dimensions": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-container-dimensions/-/react-container-dimensions-1.2.0.tgz", + "integrity": "sha1-v7XnDhCqgtLsukkUfRS7TCLK/ao=", + "requires": { + "element-resize-detector": "1.1.12", + "invariant": "2.2.2" + } + }, + "react-copy-to-clipboard": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-4.2.3.tgz", + "integrity": "sha1-JoxaD73pqV2WFFAU5/hRELDn+44=", + "requires": { + "copy-to-clipboard": "3.0.8" + } + }, + "react-deep-force-update": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-2.0.1.tgz", + "integrity": "sha1-T39sEsPn3kLzRZkqPFGCNvoeytM=", + "dev": true + }, + "react-dom": { + "version": "15.4.2", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-15.4.2.tgz", + "integrity": "sha1-AVNj8FsKH9Uq6e/dOgBg2QaVII8=", + "requires": { + "fbjs": "0.8.14", + "loose-envify": "1.3.1", + "object-assign": "4.1.1" + } + }, + "react-dropzone": { + "version": "3.7.3", + "resolved": "https://registry.npmjs.org/react-dropzone/-/react-dropzone-3.7.3.tgz", + "integrity": "sha1-eFK2ZSpDr8f6ByAh8zaRI+pKYeA=", + "requires": { + "attr-accept": "1.1.0" + } + }, + "react-element-to-jsx-string": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/react-element-to-jsx-string/-/react-element-to-jsx-string-6.0.0.tgz", + "integrity": "sha1-8sFRR27o3YF4ke01K+Ss6fs2McI=", + "requires": { + "collapse-white-space": "1.0.3", + "is-plain-object": "2.0.4", + "lodash": "4.17.4", + "sortobject": "1.1.1", + "stringify-object": "3.2.0", + "traverse": "0.6.6" + }, + "dependencies": { + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=" + } + } + }, + "react-event-listener": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/react-event-listener/-/react-event-listener-0.4.1.tgz", + "integrity": "sha1-hrU5dMPfZRhXdmt7F3aC7Xx8gxg=", + "requires": { + "babel-runtime": "6.23.0", + "react-addons-shallow-compare": "15.6.0", + "warning": "3.0.0" + } + }, + "react-hot-loader": { + "version": "3.0.0-beta.6", + "resolved": "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-3.0.0-beta.6.tgz", + "integrity": "sha1-Rj+sC/yLY6g4UlivIMkWNqvOdfQ=", + "dev": true, + "requires": { + "babel-template": "6.25.0", + "global": "4.3.2", + "react-deep-force-update": "2.0.1", + "react-proxy": "3.0.0-alpha.1", + "redbox-react": "1.4.3", + "source-map": "0.4.4" + }, + "dependencies": { + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", + "dev": true, + "requires": { + "amdefine": "1.0.1" + } + } + } + }, + "react-inspector": { + "version": "github:paritytech/react-inspector#73b5214261a5131821eb9088f58d7e5f31210c23", + "requires": { + "babel-runtime": "6.23.0", + "is-dom": "1.0.9" + } + }, + "react-intl": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-2.1.5.tgz", + "integrity": "sha1-+Xleo0t5DctdDY73Bg3dvoW/h2M=", + "requires": { + "intl-format-cache": "2.0.5", + "intl-messageformat": "1.3.0", + "intl-relativeformat": "1.3.0", + "invariant": "2.2.2" + } + }, + "react-intl-aggregate-webpack-plugin": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/react-intl-aggregate-webpack-plugin/-/react-intl-aggregate-webpack-plugin-0.0.1.tgz", + "integrity": "sha1-wplYhg17zfpvRg3sefVa4CIEiMY=", + "dev": true, + "requires": { + "mkdirp": "0.5.1" + } + }, + "react-markdown": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/react-markdown/-/react-markdown-2.4.4.tgz", + "integrity": "sha1-JtglQ40pLnym4pL+diAeHb8s/u4=", + "requires": { + "commonmark": "0.24.0", + "commonmark-react-renderer": "4.3.3", + "in-publish": "2.0.0" + } + }, + "react-portal": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/react-portal/-/react-portal-3.0.0.tgz", + "integrity": "sha1-kwT86DbooyFrIliPjckbRHco8K4=" + }, + "react-proxy": { + "version": "3.0.0-alpha.1", + "resolved": "https://registry.npmjs.org/react-proxy/-/react-proxy-3.0.0-alpha.1.tgz", + "integrity": "sha1-RABCa8+oDKpnJMd1VpUxUgn6Swc=", + "dev": true, + "requires": { + "lodash": "4.17.2" + } + }, + "react-qr-reader": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/react-qr-reader/-/react-qr-reader-1.1.3.tgz", + "integrity": "sha512-ruBF8KaSwUW9nbzjO4rA7/HOCGYZuNUz9od7uBRy8SRBi24nwxWWmwa2z8R6vPGDRglA0y2Qk1aVBuC1olTnHw==", + "requires": { + "jsqr": "git+https://github.com/JodusNodus/jsQR.git#5ba1acefa1cbb9b2bc92b49f503f2674e2ec212b", + "prop-types": "15.5.10", + "webrtc-adapter": "2.1.0" + } + }, + "react-redux": { + "version": "4.4.6", + "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-4.4.6.tgz", + "integrity": "sha1-S50ymFMHoRCWot1hVhmABE/MYgk=", + "requires": { + "hoist-non-react-statics": "1.2.0", + "invariant": "2.2.2", + "lodash": "4.17.2", + "loose-envify": "1.3.1" + } + }, + "react-router": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-3.0.0.tgz", + "integrity": "sha1-PzE+Tbr1cEjEjdCow8rCTZNmff8=", + "requires": { + "history": "3.3.0", + "hoist-non-react-statics": "1.2.0", + "invariant": "2.2.2", + "loose-envify": "1.3.1", + "warning": "3.0.0" + } + }, + "react-router-redux": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/react-router-redux/-/react-router-redux-4.0.7.tgz", + "integrity": "sha1-mx/eTnAQbFD0chThK92IjPuW4qY=" + }, + "react-smooth": { + "version": "0.1.11", + "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-0.1.11.tgz", + "integrity": "sha1-84n45Yy7VGq7SSHKDL57B5vFGg0=", + "requires": { + "lodash": "4.13.1", + "raf": "3.3.2", + "react-addons-transition-group": "15.6.0" + }, + "dependencies": { + "lodash": { + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz", + "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g=" + } + } + }, + "react-tap-event-plugin": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/react-tap-event-plugin/-/react-tap-event-plugin-2.0.1.tgz", + "integrity": "sha1-MWvrO8ZVbinshppyk+icgmqQdNI=", + "requires": { + "fbjs": "0.8.14" + } + }, + "react-tooltip": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/react-tooltip/-/react-tooltip-3.2.2.tgz", + "integrity": "sha1-OlmcDqu9nrlZeqLXKyF/17o1h2c=", + "requires": { + "classnames": "2.2.5" + } + }, + "react-transition-group": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-1.2.0.tgz", + "integrity": "sha1-tR/JIbDDg1p+98Vxx5/ILHPpIE8=", + "requires": { + "chain-function": "1.0.0", + "dom-helpers": "3.2.1", + "loose-envify": "1.3.1", + "prop-types": "15.5.10", + "warning": "3.0.0" + } + }, + "read": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz", + "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=", + "requires": { + "mute-stream": "0.0.7" + } + }, + "read-all-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", + "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", + "requires": { + "pinkie-promise": "2.0.1", + "readable-stream": "2.3.3" + } + }, + "read-cache": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", + "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", + "dev": true, + "requires": { + "pify": "2.3.0" + } + }, + "read-file-stdin": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/read-file-stdin/-/read-file-stdin-0.2.1.tgz", + "integrity": "sha1-JezP86FTtoCa+ssj7hU4fbng7mE=", + "dev": true, + "requires": { + "gather-stream": "1.0.0" + } + }, + "read-pkg": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", + "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", + "requires": { + "load-json-file": "1.1.0", + "normalize-package-data": "2.4.0", + "path-type": "1.1.0" + } + }, + "read-pkg-up": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", + "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", + "requires": { + "find-up": "1.1.2", + "read-pkg": "1.1.0" + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "readdirp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", + "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "minimatch": "3.0.4", + "readable-stream": "2.3.3", + "set-immediate-shim": "1.0.1" + } + }, + "readline2": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz", + "integrity": "sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=", + "dev": true, + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "mute-stream": "0.0.5" + }, + "dependencies": { + "mute-stream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz", + "integrity": "sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=", + "dev": true + } + } + }, + "recast": { + "version": "0.11.23", + "resolved": "https://registry.npmjs.org/recast/-/recast-0.11.23.tgz", + "integrity": "sha1-RR/TAEqx5N+bTktmN2sqIZEkYtM=", + "dev": true, + "requires": { + "ast-types": "0.9.6", + "esprima": "3.1.3", + "private": "0.1.7", + "source-map": "0.5.6" + }, + "dependencies": { + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=", + "dev": true + } + } + }, + "recharts": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/recharts/-/recharts-0.15.2.tgz", + "integrity": "sha1-Y28ho0HwCzHJJXOe1K73CttV2A8=", + "requires": { + "classnames": "2.2.5", + "core-js": "2.4.0", + "d3-scale": "1.0.0", + "d3-shape": "1.0.0", + "lodash": "4.13.1", + "react-container-dimensions": "1.2.0", + "react-smooth": "0.1.11", + "recharts-scale": "0.2.1", + "reduce-css-calc": "1.3.0" + }, + "dependencies": { + "core-js": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz", + "integrity": "sha1-30CKtG0Br/kcAcPnlxk11CLFT4E=" + }, + "lodash": { + "version": "4.13.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz", + "integrity": "sha1-g+SxCRP0hJbU0W/sSlYK8u50S2g=" + } + } + }, + "recharts-scale": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.2.1.tgz", + "integrity": "sha1-N49UPtF8MkXk2a+xCq9imCQNL8s=" + }, + "rechoir": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", + "dev": true, + "requires": { + "resolve": "1.4.0" + } + }, + "recompose": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/recompose/-/recompose-0.20.2.tgz", + "integrity": "sha1-ET1qx+KcpmTP/+wWtoHd3fFSULw=", + "requires": { + "change-emitter": "0.1.6", + "fbjs": "0.8.14", + "hoist-non-react-statics": "1.2.0", + "symbol-observable": "0.2.4" + } + }, + "redbox-react": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/redbox-react/-/redbox-react-1.4.3.tgz", + "integrity": "sha512-P/N+y57/FVUQWbgpfTf/2wjgxEhxQuA6FRLv0ipZKLFv5v8mp6qs5inFyBwJQYAgaMrntZRCvKdz1vGwkCNs7A==", + "dev": true, + "requires": { + "error-stack-parser": "1.3.6", + "object-assign": "4.1.1", + "prop-types": "15.5.10", + "sourcemapped-stacktrace": "1.1.7" + } + }, + "redent": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", + "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", + "requires": { + "indent-string": "2.1.0", + "strip-indent": "1.0.1" + } + }, + "reduce-css-calc": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", + "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", + "requires": { + "balanced-match": "0.4.2", + "math-expression-evaluator": "1.2.17", + "reduce-function-call": "1.0.2" + }, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" + } + } + }, + "reduce-function-call": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", + "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", + "requires": { + "balanced-match": "0.4.2" + }, + "dependencies": { + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=" + } + } + }, + "reduce-reducers": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/reduce-reducers/-/reduce-reducers-0.1.2.tgz", + "integrity": "sha1-+htHGLxSkqcd3R5dg5yb6pdw8Us=" + }, + "redux": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/redux/-/redux-3.6.0.tgz", + "integrity": "sha1-iHwrPQub2G7KK+cFccJ2VMGeGI0=", + "requires": { + "lodash": "4.17.2", + "lodash-es": "4.17.4", + "loose-envify": "1.3.1", + "symbol-observable": "1.0.4" + }, + "dependencies": { + "symbol-observable": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.0.4.tgz", + "integrity": "sha1-Kb9hXUqnEhvdiYsi1LP5vE4qoD0=" + } + } + }, + "redux-actions": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/redux-actions/-/redux-actions-1.1.0.tgz", + "integrity": "sha1-347HkdniZ1ROWKi6K3L8XDCvujs=", + "requires": { + "invariant": "2.2.2", + "lodash": "4.17.2", + "reduce-reducers": "0.1.2" + } + }, + "redux-thunk": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.1.0.tgz", + "integrity": "sha1-xyS/7nXb41LaLjupvBQwK63Ympg=" + }, + "regenerate": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.2.tgz", + "integrity": "sha1-0ZQcZ7rUN+G+dkM63Vs4X5WxkmA=" + }, + "regenerator-runtime": { + "version": "0.10.5", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.10.5.tgz", + "integrity": "sha1-M2w+/BIgrc7dosn6tntaeVWjNlg=" + }, + "regenerator-transform": { + "version": "0.9.11", + "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.9.11.tgz", + "integrity": "sha1-On0GdSDLe3F2dp61/4aGkb7+EoM=", + "requires": { + "babel-runtime": "6.23.0", + "babel-types": "6.25.0", + "private": "0.1.7" + } + }, + "regex-cache": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.3.tgz", + "integrity": "sha1-mxpsNdTQ3871cRrmUejp09cRQUU=", + "requires": { + "is-equal-shallow": "0.1.3", + "is-primitive": "2.0.0" + } + }, + "regexpu-core": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", + "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", + "requires": { + "regenerate": "1.3.2", + "regjsgen": "0.2.0", + "regjsparser": "0.1.5" + } + }, + "regjsgen": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", + "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" + }, + "regjsparser": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", + "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", + "requires": { + "jsesc": "0.5.0" + } + }, + "relateurl": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", + "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", + "dev": true + }, + "remove-trailing-separator": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.0.2.tgz", + "integrity": "sha1-abBi2XhyetFNxrVrpKt3L9jXBRE=" + }, + "renderkid": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz", + "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", + "dev": true, + "requires": { + "css-select": "1.2.0", + "dom-converter": "0.1.4", + "htmlparser2": "3.3.0", + "strip-ansi": "3.0.1", + "utila": "0.3.3" + }, + "dependencies": { + "domhandler": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz", + "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "domutils": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz", + "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", + "dev": true, + "requires": { + "domelementtype": "1.3.0" + } + }, + "htmlparser2": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", + "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", + "dev": true, + "requires": { + "domelementtype": "1.3.0", + "domhandler": "2.1.0", + "domutils": "1.1.6", + "readable-stream": "1.0.34" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "utila": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", + "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", + "dev": true + } + } + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, + "repeating": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", + "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", + "requires": { + "is-finite": "1.0.2" + } + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=" + }, + "request": { + "version": "2.81.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz", + "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=", + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "4.2.1", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.16", + "oauth-sign": "0.8.2", + "performance-now": "0.2.0", + "qs": "6.4.0", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.2", + "tunnel-agent": "0.6.0", + "uuid": "3.0.0" + }, + "dependencies": { + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=" + }, + "performance-now": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz", + "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=" + }, + "qs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz", + "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=" + } + } + }, + "request-capture-har": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/request-capture-har/-/request-capture-har-1.2.2.tgz", + "integrity": "sha1-zWks+yzHRP2EozWKrG7lFSjPcg0=" + }, + "require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" + }, + "require-from-string": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", + "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=" + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "require-uncached": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", + "dev": true, + "requires": { + "caller-path": "0.1.0", + "resolve-from": "1.0.1" + } + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "resolve": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.4.0.tgz", + "integrity": "sha512-aW7sVKPufyHqOmyyLzg/J+8606v5nevBgaliIlV7nUpVMsDnoBGV/cbSLNjZAg9q0Cfd/+easKVKQ8vOu8fn1Q==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, + "resolve-from": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz", + "integrity": "sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=", + "dev": true + }, + "restore-cursor": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", + "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", + "requires": { + "onetime": "2.0.1", + "signal-exit": "3.0.2" + }, + "dependencies": { + "onetime": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", + "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", + "requires": { + "mimic-fn": "1.1.0" + } + } + } + }, + "retry": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", + "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=" + }, + "rgb-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/rgb-hex/-/rgb-hex-1.0.0.tgz", + "integrity": "sha1-v6+M2c2RZLWibXHrTxWgllMks8E=", + "dev": true + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "requires": { + "align-text": "0.1.4" + } + }, + "rimraf": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz", + "integrity": "sha1-wjOOxkPfeht/5cVPqG9XQopV8z0=", + "requires": { + "glob": "7.1.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "ripemd160": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.1.tgz", + "integrity": "sha1-D0WEKVxTo2KK9+bXmsohzlfRxuc=", + "requires": { + "hash-base": "2.0.2", + "inherits": "2.0.3" + } + }, + "rlp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/rlp/-/rlp-2.0.0.tgz", + "integrity": "sha1-nbOE/0uJqPYVY9kjldhiWxjzr7A=" + }, + "roadrunner": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/roadrunner/-/roadrunner-1.1.0.tgz", + "integrity": "sha1-EYCjDWThlw2PVd2MsNqP/M7K1x4=" + }, + "rucksack-css": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/rucksack-css/-/rucksack-css-0.9.1.tgz", + "integrity": "sha1-2n66TGe9BbAMv0yDQwXF/lU3XeE=", + "dev": true, + "requires": { + "autoprefixer": "6.7.7", + "laggard": "0.1.0", + "minimist": "1.2.0", + "postcss": "5.2.17", + "postcss-alias": "1.0.0", + "postcss-clearfix": "1.0.0", + "postcss-color-rgba-fallback": "2.2.0", + "postcss-easings": "0.3.0", + "postcss-fontpath": "0.3.0", + "postcss-hexrgba": "0.2.1", + "postcss-input-style": "0.3.0", + "postcss-opacity": "4.0.0", + "postcss-position": "0.5.0", + "postcss-pseudoelements": "3.0.0", + "postcss-quantity-queries": "0.4.0", + "postcss-reporter": "2.0.0", + "postcss-responsive-type": "0.5.1", + "postcss-vmin": "2.0.0", + "read-file-stdin": "0.2.1", + "write-file-stdout": "0.0.2" + } + }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "requires": { + "is-promise": "2.1.0" + } + }, + "rx-lite": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", + "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=" + }, + "rx-lite-aggregates": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz", + "integrity": "sha1-dTuHqJoRyVRnxKwWJsTvxOBcZ74=", + "requires": { + "rx-lite": "4.0.8" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + }, + "samsam": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz", + "integrity": "sha1-vsEf3IOp/aBjQBIQ5AF2wwJNFWc=", + "dev": true + }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", + "dev": true + }, + "schema-utils": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", + "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", + "requires": { + "ajv": "5.2.2" + } + }, + "script-ext-html-webpack-plugin": { + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-1.7.1.tgz", + "integrity": "sha1-rpwOJtd2fUqnk8duNVA0TsCLbRA=", + "dev": true, + "requires": { + "debug": "2.6.8" + } + }, + "scryptsy": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/scryptsy/-/scryptsy-2.0.0.tgz", + "integrity": "sha1-Jiw28CMc+nZU4jY/o5TNLexm83g=" + }, + "sdp": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/sdp/-/sdp-1.5.4.tgz", + "integrity": "sha1-jgOPbdsUvXZa4fS1IW4SCUUR4NA=" + }, + "secp256k1": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/secp256k1/-/secp256k1-3.3.0.tgz", + "integrity": "sha512-CbrQoeGG5V0kQ1ohEMGI+J7oKerapLTpivLICBaXR0R4HyQcN3kM9itLsV5fdpV1UR1bD14tOkJ1xughmlDIiQ==", + "requires": { + "bindings": "1.3.0", + "bip66": "1.1.5", + "bn.js": "4.11.7", + "create-hash": "1.1.3", + "drbg.js": "1.0.1", + "elliptic": "6.4.0", + "nan": "2.6.2", + "prebuild-install": "2.2.1", + "safe-buffer": "5.1.1" + } + }, + "seek-bzip": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/seek-bzip/-/seek-bzip-1.0.5.tgz", + "integrity": "sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=", + "requires": { + "commander": "2.8.1" + } + }, + "semver": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz", + "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==" + }, + "semver-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/semver-regex/-/semver-regex-1.0.0.tgz", + "integrity": "sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=", + "dev": true + }, + "semver-truncate": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/semver-truncate/-/semver-truncate-1.1.2.tgz", + "integrity": "sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=", + "dev": true, + "requires": { + "semver": "5.4.1" + } + }, + "send": { + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/send/-/send-0.14.2.tgz", + "integrity": "sha1-ObBDiz9RC+Xcb2Z6EfcWiTaM3u8=", + "dev": true, + "requires": { + "debug": "2.2.0", + "depd": "1.1.1", + "destroy": "1.0.4", + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "etag": "1.7.0", + "fresh": "0.3.0", + "http-errors": "1.5.1", + "mime": "1.3.4", + "ms": "0.7.2", + "on-finished": "2.3.0", + "range-parser": "1.2.0", + "statuses": "1.3.1" + }, + "dependencies": { + "debug": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz", + "integrity": "sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=", + "dev": true, + "requires": { + "ms": "0.7.1" + }, + "dependencies": { + "ms": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz", + "integrity": "sha1-nNE8A62/8ltl7/3nzoZO6VIBcJg=", + "dev": true + } + } + }, + "ms": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz", + "integrity": "sha1-riXPJRKziFodldfwN4aNhDESR2U=", + "dev": true + } + } + }, + "serve-static": { + "version": "1.11.2", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.11.2.tgz", + "integrity": "sha1-LPmIm9RDWjIMw2iVyapXvWYuasc=", + "dev": true, + "requires": { + "encodeurl": "1.0.1", + "escape-html": "1.0.3", + "parseurl": "1.3.1", + "send": "0.14.2" + } + }, + "serviceworker-cache-polyfill": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serviceworker-cache-polyfill/-/serviceworker-cache-polyfill-4.0.0.tgz", + "integrity": "sha1-3hnuc77yGrPAdAo3sz22JGS6ves=" + }, + "serviceworker-webpack-plugin": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/serviceworker-webpack-plugin/-/serviceworker-webpack-plugin-0.2.0.tgz", + "integrity": "sha1-beneyC7RRMdUxvFbND57h2SsWyg=", + "dev": true, + "requires": { + "minimatch": "3.0.4" + } + }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" + }, + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" + }, + "setprototypeof": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.2.tgz", + "integrity": "sha1-gaVSFB7BBLiOic44MQOtXGZWTQg=", + "dev": true + }, + "sha.js": { + "version": "2.4.8", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.8.tgz", + "integrity": "sha1-NwaMLEdra69ALRSknGf1l5IfY08=", + "requires": { + "inherits": "2.0.3" + } + }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "dev": true, + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "dev": true + }, + "shelljs": { + "version": "0.7.8", + "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", + "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", + "dev": true, + "requires": { + "glob": "7.1.2", + "interpret": "1.0.3", + "rechoir": "0.6.2" + }, + "dependencies": { + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + } + } + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, + "simple-assign": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/simple-assign/-/simple-assign-0.1.0.tgz", + "integrity": "sha1-F/0wZqXz13OPUDIbsPFMooHMS6o=" + }, + "simple-get": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-1.4.3.tgz", + "integrity": "sha1-6XVe2kB+ltpAxeUVjJ6jezO+y+s=", + "requires": { + "once": "1.4.0", + "unzip-response": "1.0.2", + "xtend": "4.0.1" + } + }, + "sinon": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-1.17.7.tgz", + "integrity": "sha1-RUKk9JugxFwF6y6d2dID4rjv4L8=", + "dev": true, + "requires": { + "formatio": "1.1.1", + "lolex": "1.3.2", + "samsam": "1.1.2", + "util": "0.10.3" + } + }, + "sinon-as-promised": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/sinon-as-promised/-/sinon-as-promised-4.0.2.tgz", + "integrity": "sha1-Eg6c4DPao5ZI3EKQYv5mC+G1tBI=", + "dev": true, + "requires": { + "create-thenable": "1.0.2", + "native-promise-only": "0.8.1" + } + }, + "sinon-chai": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.8.0.tgz", + "integrity": "sha1-Qyqbv9Uab8AHmPTSUmqCnAYGh6w=", + "dev": true + }, + "sjcl": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/sjcl/-/sjcl-1.0.6.tgz", + "integrity": "sha1-ZBVGKmPMDUIVxJuuydP6DBtTUg8=" + }, + "slash": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=" + }, + "slice-ansi": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz", + "integrity": "sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=", + "dev": true + }, + "slide": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/slide/-/slide-1.1.6.tgz", + "integrity": "sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=" + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "requires": { + "hoek": "2.16.3" + } + }, + "solc": { + "version": "github:ngotchac/solc-js#04eb38cc3003fba8cb3656653a7941ed36408818", + "requires": { + "memorystream": "0.3.1", + "require-from-string": "1.2.1", + "yargs": "4.8.1" + }, + "dependencies": { + "yargs": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz", + "integrity": "sha1-wMQpJMpKqmsObaFznfshZDn53cA=", + "requires": { + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "lodash.assign": "4.2.0", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "window-size": "0.2.0", + "y18n": "3.2.1", + "yargs-parser": "2.4.1" + } + } + } + }, + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "requires": { + "is-plain-obj": "1.1.0" + } + }, + "sortobject": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/sortobject/-/sortobject-1.1.1.tgz", + "integrity": "sha1-T2ldTUTtCkwGSCw0wlgqLc3CqzQ=", + "requires": { + "editions": "1.3.3" + } + }, + "source-list-map": { + "version": "0.1.8", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", + "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", + "dev": true + }, + "source-map": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz", + "integrity": "sha1-dc449SvwczxafwwRjYEzSiu19BI=" + }, + "source-map-support": { + "version": "0.4.15", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.15.tgz", + "integrity": "sha1-AyAt9lwG0r2MfsI2KhkwVv7407E=", + "requires": { + "source-map": "0.5.6" + } + }, + "sourcemapped-stacktrace": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/sourcemapped-stacktrace/-/sourcemapped-stacktrace-1.1.7.tgz", + "integrity": "sha512-pgHNUACbafkQ+M5zR00NSOtSKBc/i40prgN+SY07J/pghClwVNWNTTMa0JuXj4lriR2TvMKcPAHw5KN9tVFRhA==", + "dev": true, + "requires": { + "source-map": "0.5.6" + } + }, + "sparkles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=" + }, + "spdx-correct": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz", + "integrity": "sha1-SzBz2TP/UfORLwOsVRlJikFQ20A=", + "requires": { + "spdx-license-ids": "1.2.2" + } + }, + "spdx-expression-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz", + "integrity": "sha1-m98vIOH0DtRH++JzJmGR/O1RYmw=" + }, + "spdx-license-ids": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz", + "integrity": "sha1-yd96NCRZSt5r0RkA1ZZpbcBrrFc=" + }, + "specificity": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/specificity/-/specificity-0.3.1.tgz", + "integrity": "sha1-8bBoQkzjF64HR42V3jwhz4Xo1Wc=", + "dev": true + }, + "split2": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz", + "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=", + "dev": true, + "requires": { + "through2": "0.6.5" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, + "squeak": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/squeak/-/squeak-1.3.0.tgz", + "integrity": "sha1-MwRQN7ZDiLVnZ0uEMiplIQc5FsM=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "console-stream": "0.1.1", + "lpad-align": "1.1.2" + } + }, + "sshpk": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" + } + } + }, + "stackframe": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-0.3.1.tgz", + "integrity": "sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ=", + "dev": true + }, + "stat-mode": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz", + "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=" + }, + "statuses": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz", + "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=", + "dev": true + }, + "store": { + "version": "1.3.20", + "resolved": "https://registry.npmjs.org/store/-/store-1.3.20.tgz", + "integrity": "sha1-E+p+P7LWwjmGgmXWhrHYTpnFvj4=" + }, + "stream-browserify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "readable-stream": "2.3.3" + } + }, + "stream-combiner": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.2.2.tgz", + "integrity": "sha1-rsjLrBd7Vrb0+kec7YwZEs7lKFg=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "through": "2.3.8" + } + }, + "stream-combiner2": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz", + "integrity": "sha1-+02KFCDqNidk4hrUeAOXvry0HL4=", + "requires": { + "duplexer2": "0.1.4", + "readable-stream": "2.3.3" + } + }, + "stream-http": { + "version": "2.7.2", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz", + "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==", + "dev": true, + "requires": { + "builtin-status-codes": "3.0.0", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "to-arraybuffer": "1.0.1", + "xtend": "4.0.1" + } + }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + }, + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=" + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "1.1.0", + "is-fullwidth-code-point": "1.0.0", + "strip-ansi": "3.0.1" + } + }, + "string.prototype.repeat": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz", + "integrity": "sha1-q6Nt4I3O5qWjN9SbLqHaGyj8Ds8=" + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringify-object": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.2.0.tgz", + "integrity": "sha1-lDcKE15BvASDWIE7+ZSB8TFcaqY=", + "requires": { + "get-own-enumerable-property-symbols": "1.0.1", + "is-obj": "1.0.1", + "is-regexp": "1.0.0" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=" + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-bom-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", + "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", + "requires": { + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" + } + }, + "strip-dirs": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/strip-dirs/-/strip-dirs-1.1.1.tgz", + "integrity": "sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=", + "requires": { + "chalk": "1.1.3", + "get-stdin": "4.0.1", + "is-absolute": "0.1.7", + "is-natural-number": "2.1.1", + "minimist": "1.2.0", + "sum-up": "1.0.3" + }, + "dependencies": { + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + } + } + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", + "dev": true + }, + "strip-hex-prefix": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz", + "integrity": "sha1-DF8VX+8RUTczd96du1iNoFUA428=", + "requires": { + "is-hex-prefixed": "1.0.0" + } + }, + "strip-indent": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", + "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", + "requires": { + "get-stdin": "4.0.1" + }, + "dependencies": { + "get-stdin": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", + "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=" + } + } + }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, + "strip-outer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-outer/-/strip-outer-1.0.0.tgz", + "integrity": "sha1-qsC6YNLpDF1PJ1/Yhp/ZotMQ/7g=", + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "style-loader": { + "version": "0.13.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.13.1.tgz", + "integrity": "sha1-RoKA77wEcwI806bNVuM7Wh1/w6k=", + "dev": true, + "requires": { + "loader-utils": "0.2.17" + } + }, + "style-search": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz", + "integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=", + "dev": true + }, + "stylehacks": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-2.3.2.tgz", + "integrity": "sha1-ZMg+BDimjJ7fRJ6MVSp9mrYAmws=", + "dev": true, + "requires": { + "browserslist": "1.7.7", + "chalk": "1.1.3", + "log-symbols": "1.0.2", + "minimist": "1.2.0", + "plur": "2.1.2", + "postcss": "5.2.17", + "postcss-reporter": "1.4.1", + "postcss-selector-parser": "2.2.3", + "read-file-stdin": "0.2.1", + "text-table": "0.2.0", + "write-file-stdout": "0.0.2" + }, + "dependencies": { + "postcss-reporter": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-1.4.1.tgz", + "integrity": "sha1-wTbwpbFhkV83ndN2XGEHX357mvI=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "lodash": "4.17.2", + "log-symbols": "1.0.2", + "postcss": "5.2.17" + } + } + } + }, + "stylelint": { + "version": "7.9.0", + "resolved": "https://registry.npmjs.org/stylelint/-/stylelint-7.9.0.tgz", + "integrity": "sha1-uNnqIPiHqzUQdcat7ZUo3iRQkyc=", + "dev": true, + "requires": { + "autoprefixer": "6.7.7", + "balanced-match": "0.4.2", + "chalk": "1.1.3", + "colorguard": "1.2.0", + "cosmiconfig": "2.2.2", + "doiuse": "2.6.0", + "execall": "1.0.0", + "get-stdin": "5.0.1", + "globby": "6.1.0", + "globjoin": "0.1.4", + "html-tags": "1.2.0", + "ignore": "3.3.3", + "known-css-properties": "0.0.6", + "lodash": "4.17.4", + "log-symbols": "1.0.2", + "meow": "3.7.0", + "micromatch": "2.3.11", + "normalize-selector": "0.2.0", + "postcss": "5.2.17", + "postcss-less": "0.14.0", + "postcss-media-query-parser": "0.2.3", + "postcss-reporter": "3.0.0", + "postcss-resolve-nested-selector": "0.1.1", + "postcss-scss": "0.4.1", + "postcss-selector-parser": "2.2.3", + "postcss-value-parser": "3.3.0", + "resolve-from": "2.0.0", + "specificity": "0.3.1", + "string-width": "2.1.1", + "style-search": "0.1.0", + "stylehacks": "2.3.2", + "sugarss": "0.2.0", + "svg-tags": "1.0.0", + "table": "4.0.1" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "balanced-match": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", + "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", + "dev": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "get-stdin": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-5.0.1.tgz", + "integrity": "sha1-Ei4WFZHiH/TFJTAwVpPyDmOTo5g=", + "dev": true + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", + "dev": true, + "requires": { + "array-union": "1.0.2", + "glob": "7.1.2", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1" + } + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "lodash": { + "version": "4.17.4", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz", + "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=", + "dev": true + }, + "postcss-reporter": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/postcss-reporter/-/postcss-reporter-3.0.0.tgz", + "integrity": "sha1-CeoPN6RExWk4eGBuCbAY6+/3z48=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "lodash": "4.17.4", + "log-symbols": "1.0.2", + "postcss": "5.2.17" + } + }, + "resolve-from": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", + "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + }, + "table": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/table/-/table-4.0.1.tgz", + "integrity": "sha1-qBFsEz+sLGH0pCCrbN9cTWHw5DU=", + "dev": true, + "requires": { + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.4", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + } + } + } + }, + "stylelint-config-standard": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/stylelint-config-standard/-/stylelint-config-standard-16.0.0.tgz", + "integrity": "sha1-u3OHv/HX3XGGpSs+v4hbJAXWkb8=", + "dev": true + }, + "sugarss": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/sugarss/-/sugarss-0.2.0.tgz", + "integrity": "sha1-rDQjdWMyfG/4l7ZHQr9q7BkK054=", + "dev": true, + "requires": { + "postcss": "5.2.17" + } + }, + "sum-up": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sum-up/-/sum-up-1.0.3.tgz", + "integrity": "sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=", + "requires": { + "chalk": "1.1.3" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" + }, + "svg-tags": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz", + "integrity": "sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=", + "dev": true + }, + "svgo": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", + "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", + "dev": true, + "requires": { + "coa": "1.0.4", + "colors": "1.1.2", + "csso": "2.3.2", + "js-yaml": "3.7.0", + "mkdirp": "0.5.1", + "sax": "1.2.4", + "whet.extend": "0.9.9" + }, + "dependencies": { + "js-yaml": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", + "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "2.7.3" + } + } + } + }, + "sw-toolbox": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/sw-toolbox/-/sw-toolbox-3.6.0.tgz", + "integrity": "sha1-Jt8dHHA0hljk3qKIQxkUm3sxg7U=", + "requires": { + "path-to-regexp": "1.7.0", + "serviceworker-cache-polyfill": "4.0.0" + } + }, + "symbol-observable": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-0.2.4.tgz", + "integrity": "sha1-lag9smGG1q9+ehjb2XYKL4bQj0A=" + }, + "symbol-tree": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", + "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=", + "dev": true + }, + "synesthesia": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/synesthesia/-/synesthesia-1.0.1.tgz", + "integrity": "sha1-XvlepUjA1cbm+btLDQcx3/hkp3c=", + "dev": true, + "requires": { + "css-color-names": "0.0.3" + }, + "dependencies": { + "css-color-names": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.3.tgz", + "integrity": "sha1-3gzvFvTYqoIioyDVttfpu62nufY=", + "dev": true + } + } + }, + "table": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/table/-/table-3.8.3.tgz", + "integrity": "sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=", + "dev": true, + "requires": { + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "chalk": "1.1.3", + "lodash": "4.17.2", + "slice-ansi": "0.0.4", + "string-width": "2.1.1" + }, + "dependencies": { + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "3.0.0" + } + } + } + }, + "tapable": { + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.7.tgz", + "integrity": "sha1-5GwNqsuyuKmLmwzqD0BSEFgX7Vw=", + "dev": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "tar-fs": { + "version": "1.15.3", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.15.3.tgz", + "integrity": "sha1-7M+TXpQUk9gVECjmNuUc5MPKfyA=", + "requires": { + "chownr": "1.0.1", + "mkdirp": "0.5.1", + "pump": "1.0.2", + "tar-stream": "1.5.4" + } + }, + "tar-pack": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/tar-pack/-/tar-pack-3.4.0.tgz", + "integrity": "sha1-I74tf2cagzk3bL2wuP4/3r8xeYQ=", + "requires": { + "debug": "2.6.8", + "fstream": "1.0.11", + "fstream-ignore": "1.0.5", + "once": "1.4.0", + "readable-stream": "2.3.3", + "rimraf": "2.6.1", + "tar": "2.2.1", + "uid-number": "0.0.6" + } + }, + "tar-stream": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.4.tgz", + "integrity": "sha1-NlSc8E7RrumyowwBQyUiONr5QBY=", + "requires": { + "bl": "1.2.1", + "end-of-stream": "1.4.0", + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "temp-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz", + "integrity": "sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=", + "dev": true + }, + "tempfile": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-2.0.0.tgz", + "integrity": "sha1-awRGhWqbERTRhW/8vlCczLCXcmU=", + "dev": true, + "requires": { + "temp-dir": "1.0.0", + "uuid": "3.1.0" + }, + "dependencies": { + "uuid": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz", + "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==", + "dev": true + } + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=" + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" + } + } + }, + "through2-filter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "requires": { + "through2": "2.0.3", + "xtend": "4.0.1" + }, + "dependencies": { + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + } + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=" + }, + "timed-out": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz", + "integrity": "sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=" + }, + "timers-browserify": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz", + "integrity": "sha512-+JAqyNgg+M8+gXIrq2EeUr4kZqRz47Ysco7X5QKRGScRE9HIHckyHD1asozSFGeqx2nmPCgA8T5tIGVO0ML7/w==", + "dev": true, + "requires": { + "global": "4.3.2", + "setimmediate": "1.0.5" + } + }, + "tmp": { + "version": "0.0.31", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz", + "integrity": "sha1-jzirlDjhcxXl29izZX6L+yd65Kc=", + "requires": { + "os-tmpdir": "1.0.2" + } + }, + "to-absolute-glob": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", + "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "requires": { + "extend-shallow": "2.0.1" + } + }, + "to-arraybuffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", + "dev": true + }, + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=" + }, + "to-source": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/to-source/-/to-source-2.0.3.tgz", + "integrity": "sha1-U4f4JZzzV2Kz4+m1wtzY49uaLRU=", + "dev": true + }, + "toggle-selection": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz", + "integrity": "sha1-bkWxJj8gF/oKzH2J14sVuL932jI=" + }, + "toposort": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.3.tgz", + "integrity": "sha1-8CzYp0vYvi/A6YYRw7rLlaFxhpw=", + "dev": true + }, + "tough-cookie": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz", + "integrity": "sha1-8IH3bkyFcg5sN6X6ztc3FQ2EByo=", + "requires": { + "punycode": "1.4.1" + } + }, + "tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=", + "dev": true + }, + "traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=" + }, + "trim-newlines": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", + "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=" + }, + "trim-repeated": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/trim-repeated/-/trim-repeated-1.0.0.tgz", + "integrity": "sha1-42RqLqTokTEr9+rObPsFOAvAHCE=", + "requires": { + "escape-string-regexp": "1.0.5" + } + }, + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=" + }, + "tryit": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tryit/-/tryit-1.0.3.tgz", + "integrity": "sha1-OTvnMKlEb9Hq1tpZoBQwjzbCics=", + "dev": true + }, + "tty-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "requires": { + "safe-buffer": "5.1.1" + } + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "optional": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "1.1.2" + } + }, + "type-detect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-1.0.0.tgz", + "integrity": "sha1-diIXzAbbJY7EiQihKY6LlRIejqI=", + "dev": true + }, + "type-is": { + "version": "1.6.15", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.15.tgz", + "integrity": "sha1-yrEPtJCeRByChC6v4a1kbIGARBA=", + "dev": true, + "requires": { + "media-typer": "0.3.0", + "mime-types": "2.1.16" + } + }, + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" + }, + "typedarray-to-buffer": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.2.tgz", + "integrity": "sha1-EBezLZhP9VbroQD1AViauhrOLgQ=", + "dev": true, + "requires": { + "is-typedarray": "1.0.0" + } + }, + "u2f-api": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/u2f-api/-/u2f-api-0.0.9.tgz", + "integrity": "sha1-ve1Fe6Wpqe6bWLPeKR+MH4/qy3o=" + }, + "u2f-api-polyfill": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/u2f-api-polyfill/-/u2f-api-polyfill-0.4.3.tgz", + "integrity": "sha1-t60WWm+WJVhReoZ8XEv5OZ/Pfpg=" + }, + "ua-parser-js": { + "version": "0.7.14", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.14.tgz", + "integrity": "sha1-EQ1T+kw/MmwSEpK76skE0uAzh8o=" + }, + "uglify-js": { + "version": "2.8.16", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.16.tgz", + "integrity": "sha1-0oYZC27vxv1l6w7KxlUeCw6IOaQ=", + "requires": { + "source-map": "0.5.6", + "uglify-to-browserify": "1.0.2", + "yargs": "3.10.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "requires": { + "center-align": "0.1.3", + "right-align": "0.1.3", + "wordwrap": "0.0.2" + } + }, + "window-size": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", + "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=" + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "requires": { + "camelcase": "1.2.1", + "cliui": "2.1.0", + "decamelize": "1.2.0", + "window-size": "0.1.0" + } + } + } + }, + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "optional": true + }, + "uid-number": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.6.tgz", + "integrity": "sha1-DqEOgDXo61uOREnwbaHHMGY7qoE=" + }, + "uniq": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", + "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", + "dev": true + }, + "uniqid": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/uniqid/-/uniqid-4.1.1.tgz", + "integrity": "sha1-iSIN32t1GuUrX3JISGNShZa7hME=", + "dev": true, + "requires": { + "macaddress": "0.2.8" + } + }, + "uniqs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", + "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", + "dev": true + }, + "unique-concat": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/unique-concat/-/unique-concat-0.2.2.tgz", + "integrity": "sha1-khD5vcqsxeHjkpSQ18AZ35bxhxI=", + "dev": true + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", + "dev": true + }, + "unzip-response": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz", + "integrity": "sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=" + }, + "upper-case": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", + "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", + "dev": true + }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + } + } + }, + "url-loader": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.7.tgz", + "integrity": "sha1-Z+h3l1n4AA2nSZSQZoDJQ6mwkl0=", + "dev": true, + "requires": { + "loader-utils": "0.2.17", + "mime": "1.2.11" + }, + "dependencies": { + "mime": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz", + "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=", + "dev": true + } + } + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "1.0.4" + } + }, + "url-regex": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/url-regex/-/url-regex-3.2.0.tgz", + "integrity": "sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=", + "dev": true, + "requires": { + "ip-regex": "1.0.3" + } + }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=", + "dev": true + }, + "useragent.js": { + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/useragent.js/-/useragent.js-0.5.6.tgz", + "integrity": "sha1-p2rvEB4kg3AlI/9vtYpACvd+Iqk=" + }, + "utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha1-H6DZJw6b6FDZsFAn9jUZv0ZFfZY=" + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "requires": { + "inherits": "2.0.1" + }, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + } + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + }, + "utila": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", + "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", + "dev": true + }, + "utils-merge": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz", + "integrity": "sha1-ApT7kiu5N1FTVBxPcJYjHyh8ivg=", + "dev": true + }, + "uuid": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.0.0.tgz", + "integrity": "sha1-Zyj8BFnEUNeWqZwxg3VpvfZy1yg=" + }, + "v8flags": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz", + "integrity": "sha1-qrGh+jDUX4jdMhFIh1rALAtV5bQ=", + "dev": true, + "requires": { + "user-home": "1.1.1" + } + }, + "vali-date": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", + "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=" + }, + "valid-url": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz", + "integrity": "sha1-HBRHm0DxOXp1eC8RXkCGRHQzogA=" + }, + "validate-npm-package-license": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz", + "integrity": "sha1-KAS6vnEq0zeUWaz74kdGqywwP7w=", + "requires": { + "spdx-correct": "1.0.2", + "spdx-expression-parse": "1.0.4" + } + }, + "validator": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-6.2.0.tgz", + "integrity": "sha1-sszNxJ/w9LjuTmHbot3T3eE/I+c=" + }, + "vary": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz", + "integrity": "sha1-Z1Neu2lMHVIldFeYRmUyP1h+jTc=", + "dev": true + }, + "vendors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.1.tgz", + "integrity": "sha1-N61zyO5Bf7PVgOeFMSMH0nSEfyI=", + "dev": true + }, + "verror": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz", + "integrity": "sha1-z/XfEpRtKX0rqu+qJoniW+AcAFw=", + "requires": { + "extsprintf": "1.0.2" + } + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "requires": { + "clone": "1.0.2", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + }, + "vinyl-assign": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/vinyl-assign/-/vinyl-assign-1.2.1.tgz", + "integrity": "sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=", + "requires": { + "object-assign": "4.1.1", + "readable-stream": "2.3.3" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "requires": { + "duplexify": "3.5.0", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + }, + "dependencies": { + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + } + } + }, + "vm-browserify": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", + "dev": true, + "requires": { + "indexof": "0.0.1" + } + }, + "w3c-blob": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/w3c-blob/-/w3c-blob-0.0.1.tgz", + "integrity": "sha1-sM01KhpQ9RVWNCD/1YYflQ8dhbg=" + }, + "ware": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ware/-/ware-1.3.0.tgz", + "integrity": "sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=", + "requires": { + "wrap-fn": "0.1.5" + } + }, + "warning": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz", + "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", + "requires": { + "loose-envify": "1.3.1" + } + }, + "watchpack": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz", + "integrity": "sha1-ShRyvLuVK9Cpu0A2gB+VTfs5+qw=", + "dev": true, + "requires": { + "async": "2.5.0", + "chokidar": "1.7.0", + "graceful-fs": "4.1.11" + }, + "dependencies": { + "async": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "dev": true, + "requires": { + "lodash": "4.17.2" + } + } + } + }, + "web3": { + "version": "0.17.0-beta", + "resolved": "https://registry.npmjs.org/web3/-/web3-0.17.0-beta.tgz", + "integrity": "sha1-V684JFv/ejIJn3zleA+tW7wA2ls=", + "requires": { + "bignumber.js": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2", + "crypto-js": "3.1.8", + "utf8": "2.1.2", + "xmlhttprequest": "1.8.0" + }, + "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/debris/bignumber.js.git#94d7146671b9719e00a09c29b01a691bc85048c2" + } + } + }, + "webidl-conversions": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.1.tgz", + "integrity": "sha1-gBWherg+fhsxFjhIas6B2mziBqA=", + "dev": true + }, + "webpack": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.2.1.tgz", + "integrity": "sha1-e7HXKuIIfdGkr1Jq/sFe7RfdpHU=", + "dev": true, + "requires": { + "acorn": "4.0.13", + "acorn-dynamic-import": "2.0.2", + "ajv": "4.11.8", + "ajv-keywords": "1.5.1", + "async": "2.5.0", + "enhanced-resolve": "3.4.1", + "interpret": "1.0.3", + "json-loader": "0.5.4", + "loader-runner": "2.3.0", + "loader-utils": "0.2.17", + "memory-fs": "0.4.1", + "mkdirp": "0.5.1", + "node-libs-browser": "2.0.0", + "source-map": "0.5.6", + "supports-color": "3.2.3", + "tapable": "0.2.7", + "uglify-js": "2.8.16", + "watchpack": "1.4.0", + "webpack-sources": "0.1.5", + "yargs": "6.6.0" + }, + "dependencies": { + "acorn": { + "version": "4.0.13", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", + "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", + "dev": true + }, + "ajv": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz", + "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=", + "dev": true, + "requires": { + "co": "4.6.0", + "json-stable-stringify": "1.0.1" + } + }, + "async": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz", + "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==", + "dev": true, + "requires": { + "lodash": "4.17.2" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "has-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", + "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", + "dev": true + }, + "supports-color": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", + "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", + "dev": true, + "requires": { + "has-flag": "1.0.0" + } + } + } + }, + "webpack-bundle-size-analyzer": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/webpack-bundle-size-analyzer/-/webpack-bundle-size-analyzer-2.5.0.tgz", + "integrity": "sha1-k56kZeRVk1Op/OQK9RGCDyFqnIA=", + "dev": true, + "requires": { + "commander": "2.8.1", + "filesize": "3.5.10", + "humanize": "0.0.9" + } + }, + "webpack-dev-middleware": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.10.1.tgz", + "integrity": "sha1-xrTPQoE5zxrvvgagwA/bT42i+JM=", + "dev": true, + "requires": { + "memory-fs": "0.4.1", + "mime": "1.3.4", + "path-is-absolute": "1.0.1", + "range-parser": "1.2.0" + } + }, + "webpack-error-notification": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/webpack-error-notification/-/webpack-error-notification-0.1.6.tgz", + "integrity": "sha1-6/y9TvRrg0ZrWcEv3oeQFo9Holc=", + "dev": true + }, + "webpack-hot-middleware": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/webpack-hot-middleware/-/webpack-hot-middleware-2.17.1.tgz", + "integrity": "sha1-DI+/b5P/KcCV1oSwerbWwPL5Udc=", + "dev": true, + "requires": { + "ansi-html": "0.0.7", + "html-entities": "1.2.1", + "querystring": "0.2.0", + "strip-ansi": "3.0.1" + } + }, + "webpack-sources": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-0.1.5.tgz", + "integrity": "sha1-qh86vw8NdNtxEcQOUAuE+WZkB1A=", + "dev": true, + "requires": { + "source-list-map": "0.1.8", + "source-map": "0.5.6" + } + }, + "webrtc-adapter": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/webrtc-adapter/-/webrtc-adapter-2.1.0.tgz", + "integrity": "sha1-YStbxs6Oc8nQZgA4oh+SVahnvz4=", + "requires": { + "sdp": "1.5.4" + } + }, + "websocket": { + "version": "1.0.24", + "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.24.tgz", + "integrity": "sha1-dJA+dfJUW2suHeFCW8HJBZF6GJA=", + "dev": true, + "requires": { + "debug": "2.6.8", + "nan": "2.6.2", + "typedarray-to-buffer": "3.1.2", + "yaeti": "0.0.6" + } + }, + "whatwg-encoding": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.1.tgz", + "integrity": "sha1-PGxFGhmO567FWx7GHQkgxngBpfQ=", + "dev": true, + "requires": { + "iconv-lite": "0.4.13" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz", + "integrity": "sha1-H4irpKsLFQjoMSrMOTRfNumS4vI=", + "dev": true + } + } + }, + "whatwg-fetch": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.1.tgz", + "integrity": "sha1-B4uUYbvpHOpzy86LsSKgX56St3I=" + }, + "whatwg-url": { + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-4.8.0.tgz", + "integrity": "sha1-0pgaqRSMHgCkHFphMRZqtGg7vMA=", + "dev": true, + "requires": { + "tr46": "0.0.3", + "webidl-conversions": "3.0.1" + }, + "dependencies": { + "webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=", + "dev": true + } + } + }, + "whet.extend": { + "version": "0.9.9", + "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", + "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", + "dev": true + }, + "which": { + "version": "1.2.14", + "resolved": "https://registry.npmjs.org/which/-/which-1.2.14.tgz", + "integrity": "sha1-mofEN48D6CfOyvGs31bHNsAcFOU=", + "requires": { + "isexe": "2.0.0" + } + }, + "which-module": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", + "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=" + }, + "wide-align": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.2.tgz", + "integrity": "sha512-ijDLlyQ7s6x1JgCLur53osjm/UXUYD9+0PbYKrBsYisYXzCxN+HC3mYDNy/dWdmf3AwqwU3CXwDCvsNgGK1S0w==", + "requires": { + "string-width": "1.0.2" + } + }, + "window-size": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz", + "integrity": "sha1-tDFbtCFKPXBY6+7okuE/ok2YsHU=" + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" + }, + "worker-loader": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/worker-loader/-/worker-loader-0.8.1.tgz", + "integrity": "sha1-6OmVMx6jTfW/aCloJL+38K1XjUM=", + "requires": { + "loader-utils": "1.1.0", + "schema-utils": "0.3.0" + }, + "dependencies": { + "loader-utils": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", + "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", + "requires": { + "big.js": "3.1.3", + "emojis-list": "2.1.0", + "json5": "0.5.1" + } + } + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "1.0.2", + "strip-ansi": "3.0.1" + } + }, + "wrap-fn": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/wrap-fn/-/wrap-fn-0.1.5.tgz", + "integrity": "sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=", + "requires": { + "co": "3.1.0" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "write": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz", + "integrity": "sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=", + "dev": true, + "requires": { + "mkdirp": "0.5.1" + } + }, + "write-file-atomic": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz", + "integrity": "sha1-+Aek8LHZ6ROuekgRLmzDrxmRtF8=", + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "slide": "1.1.6" + } + }, + "write-file-stdout": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/write-file-stdout/-/write-file-stdout-0.0.2.tgz", + "integrity": "sha1-wlLXx8WxtAKJdjDjRTx7/mkNnKE=", + "dev": true + }, + "write-json-file": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/write-json-file/-/write-json-file-1.2.0.tgz", + "integrity": "sha1-LV3+lqvDyIkFfJOXGqQAXvtUgTQ=", + "requires": { + "graceful-fs": "4.1.11", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "pify": "2.3.0", + "pinkie-promise": "2.0.1", + "sort-keys": "1.1.2", + "write-file-atomic": "1.3.4" + } + }, + "xml-char-classes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", + "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=", + "dev": true + }, + "xml-name-validator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz", + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=", + "dev": true + }, + "xmlhttprequest": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.8.0.tgz", + "integrity": "sha1-Z/4HXFwk/vOfnWX197f+dRcZaPw=" + }, + "xss-filters": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/xss-filters/-/xss-filters-1.2.7.tgz", + "integrity": "sha1-Wfod4gHzby80cNysX1jMwoMLCpo=" + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=" + }, + "y18n": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", + "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" + }, + "yaeti": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", + "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=", + "dev": true + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", + "dev": true + }, + "yargs": { + "version": "6.6.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", + "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", + "dev": true, + "requires": { + "camelcase": "3.0.0", + "cliui": "3.2.0", + "decamelize": "1.2.0", + "get-caller-file": "1.0.2", + "os-locale": "1.4.0", + "read-pkg-up": "1.0.1", + "require-directory": "2.1.1", + "require-main-filename": "1.0.1", + "set-blocking": "2.0.0", + "string-width": "1.0.2", + "which-module": "1.0.0", + "y18n": "3.2.1", + "yargs-parser": "4.2.1" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", + "dev": true + }, + "yargs-parser": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", + "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", + "dev": true, + "requires": { + "camelcase": "3.0.0" + } + } + } + }, + "yargs-parser": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz", + "integrity": "sha1-hVaN488VD/SfpRgl8DqMiA3cxcQ=", + "requires": { + "camelcase": "3.0.0", + "lodash.assign": "4.2.0" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + } + } + }, + "yarn": { + "version": "0.21.3", + "resolved": "https://registry.npmjs.org/yarn/-/yarn-0.21.3.tgz", + "integrity": "sha1-jdo6Y8eYs4PPpXdFLCs8s+Sqh+A=", + "requires": { + "babel-runtime": "6.23.0", + "bytes": "2.4.0", + "camelcase": "3.0.0", + "chalk": "1.1.3", + "cmd-shim": "2.0.2", + "commander": "2.11.0", + "death": "1.1.0", + "debug": "2.6.8", + "defaults": "1.0.3", + "detect-indent": "5.0.0", + "ini": "1.3.4", + "inquirer": "3.2.1", + "invariant": "2.2.2", + "is-builtin-module": "1.0.0", + "is-ci": "1.0.10", + "leven": "2.1.0", + "loud-rejection": "1.6.0", + "minimatch": "3.0.4", + "mkdirp": "0.5.1", + "node-emoji": "1.8.1", + "node-gyp": "3.6.2", + "object-path": "0.11.4", + "proper-lockfile": "2.0.1", + "read": "1.0.7", + "request": "2.81.0", + "request-capture-har": "1.2.2", + "rimraf": "2.6.1", + "roadrunner": "1.1.0", + "semver": "5.4.1", + "strip-bom": "3.0.0", + "tar": "2.2.1", + "tar-stream": "1.5.4", + "validate-npm-package-license": "3.0.1" + }, + "dependencies": { + "camelcase": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", + "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" + }, + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==" + }, + "detect-indent": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-5.0.0.tgz", + "integrity": "sha1-OHHMCmoALow+Wzz38zYmRnXwa50=" + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + } + } + }, + "yauzl": { + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.8.0.tgz", + "integrity": "sha1-eUUK/yKyqcWkHvVOAtuQfM+/nuI=", + "requires": { + "buffer-crc32": "0.2.13", + "fd-slicer": "1.0.1" + } + }, + "zxcvbn": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/zxcvbn/-/zxcvbn-4.4.1.tgz", + "integrity": "sha1-I4Gq3X8HiiWoayFTJ1YmR7gKqKw=" + } + } +} diff --git a/js-old/package.json b/js-old/package.json new file mode 100644 index 0000000000000000000000000000000000000000..52415f95ab75ae5788f51507dbff40b44a7a1301 --- /dev/null +++ b/js-old/package.json @@ -0,0 +1,240 @@ +{ + "name": "parity.js", + "version": "1.8.18", + "main": "release/index.js", + "jsnext:main": "src/index.js", + "author": "Parity Team ", + "maintainers": [ + "Jaco Greeff", + "Nicolas Gotchac" + ], + "contributors": [ + "Jannis Redmann" + ], + "license": "GPL-3.0", + "repository": { + "type": "git", + "url": "git+https://github.com/paritytech/parity.git" + }, + "keywords": [ + "Ethereum", + "ABI", + "API", + "Web3", + "RPC", + "Parity", + "Promise" + ], + "scripts": { + "install": "napa", + "analize": "npm run analize:lib && npm run analize:dll && npm run analize:app", + "analize:app": "WPANALIZE=1 webpack --config webpack/app --json > .build/analize.app.json && cat .build/analize.app.json | webpack-bundle-size-analyzer", + "analize:lib": "WPANALIZE=1 webpack --config webpack/libraries --json > .build/analize.lib.json && cat .build/analize.lib.json | webpack-bundle-size-analyzer", + "analize:dll": "WPANALIZE=1 webpack --config webpack/vendor --json > .build/analize.dll.json && cat .build/analize.dll.json | webpack-bundle-size-analyzer", + "build": "npm run build:lib && npm run build:dll && npm run build:app && npm run build:embed", + "build:app": "webpack --config webpack/app", + "build:lib": "webpack --config webpack/libraries", + "build:dll": "webpack --config webpack/vendor", + "build:markdown": "babel-node ./scripts/build-rpc-markdown.js", + "build:json": "babel-node ./scripts/build-rpc-json.js", + "build:embed": "EMBED=1 node webpack/embed", + "build:i18n": "npm run clean && npm run build && babel-node ./scripts/build-i18n.js", + "ci:build": "npm run ci:build:lib && npm run ci:build:dll && npm run ci:build:app && npm run ci:build:embed", + "ci:build:app": "NODE_ENV=production webpack --config webpack/app", + "ci:build:lib": "NODE_ENV=production webpack --config webpack/libraries", + "ci:build:dll": "NODE_ENV=production webpack --config webpack/vendor", + "ci:build:npm": "NODE_ENV=production webpack --config webpack/npm", + "ci:build:jsonrpc": "babel-node ./scripts/build-rpc-json.js --output .npmjs/jsonrpc", + "ci:build:embed": "NODE_ENV=production EMBED=1 node webpack/embed", + "start": "npm run clean && npm install && npm run build:lib && npm run build:dll && npm run start:app", + "start:app": "node webpack/dev.server", + "clean": "rm -rf ./.build ./.coverage ./.happypack ./.npmjs ./build ./node_modules/.cache ./node_modules/@parity", + "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info", + "lint": "npm run lint:css && npm run lint:js", + "lint:cached": "npm run lint:css && npm run lint:js:cached", + "lint:css": "stylelint ./src/**/*.css", + "lint:fix": "npm run lint:js:fix", + "lint:i18n": "babel-node ./scripts/lint-i18n.js", + "lint:js": "eslint --ignore-path .gitignore ./src/", + "lint:js:cached": "eslint --cache --ignore-path .gitignore ./src/", + "lint:js:fix": "eslint --fix --ignore-path .gitignore ./src/", + "test": "NODE_ENV=test mocha --compilers ejs:ejsify 'src/**/*.spec.js'", + "test:coverage": "NODE_ENV=test istanbul cover _mocha -- --compilers ejs:ejsify 'src/**/*.spec.js'", + "test:e2e": "NODE_ENV=test mocha 'src/**/*.e2e.js'", + "test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)", + "prepush": "npm run lint:cached" + }, + "napa": { + "qrcode-generator": "kazuhikoarase/qrcode-generator" + }, + "devDependencies": { + "babel-cli": "6.23.0", + "babel-core": "6.23.1", + "babel-eslint": "7.1.1", + "babel-loader": "6.3.2", + "babel-plugin-lodash": "3.2.11", + "babel-plugin-react-intl": "2.3.1", + "babel-plugin-recharts": "1.1.0", + "babel-plugin-transform-class-properties": "6.23.0", + "babel-plugin-transform-decorators-legacy": "1.3.4", + "babel-plugin-transform-es2015-modules-commonjs": "6.24.1", + "babel-plugin-transform-object-rest-spread": "6.23.0", + "babel-plugin-transform-react-remove-prop-types": "0.3.2", + "babel-plugin-transform-runtime": "6.23.0", + "babel-plugin-webpack-alias": "2.1.2", + "babel-preset-env": "1.1.9", + "babel-preset-es2015": "6.22.0", + "babel-preset-es2016": "6.22.0", + "babel-preset-es2017": "6.22.0", + "babel-preset-react": "6.23.0", + "babel-preset-stage-0": "6.22.0", + "babel-register": "6.23.0", + "babel-runtime": "6.23.0", + "chai": "3.5.0", + "chai-as-promised": "6.0.0", + "chai-enzyme": "0.6.1", + "chalk": "1.1.3", + "circular-dependency-plugin": "2.0.0", + "copy-webpack-plugin": "4.0.1", + "core-js": "2.4.1", + "coveralls": "2.11.16", + "css-loader": "0.26.1", + "ejs-loader": "0.3.0", + "ejsify": "1.0.0", + "empty-module": "0.0.2", + "enzyme": "2.7.1", + "eslint": "3.16.1", + "eslint-config-semistandard": "7.0.0", + "eslint-config-standard": "6.2.1", + "eslint-config-standard-react": "4.2.0", + "eslint-plugin-promise": "3.4.2", + "eslint-plugin-react": "6.10.0", + "eslint-plugin-standard": "2.0.1", + "express": "4.14.1", + "extract-loader": "0.1.0", + "extract-text-webpack-plugin": "2.0.0-beta.4", + "file-loader": "0.10.0", + "happypack": "3.0.3", + "html-loader": "0.4.4", + "html-webpack-plugin": "2.28.0", + "http-proxy-middleware": "0.17.3", + "husky": "0.13.1", + "ignore-styles": "5.0.1", + "image-webpack-loader": "3.2.0", + "istanbul": "1.0.0-alpha.2", + "jsdom": "9.11.0", + "json-loader": "0.5.4", + "markdown-loader": "2.0.0", + "mocha": "3.2.0", + "mock-local-storage": "1.0.2", + "mock-socket": "6.0.4", + "nock": "9.0.7", + "postcss-import": "9.1.0", + "postcss-loader": "1.3.2", + "postcss-nested": "1.0.0", + "postcss-simple-vars": "3.0.0", + "progress": "1.1.8", + "progress-bar-webpack-plugin": "1.9.3", + "raw-loader": "0.5.1", + "react-addons-perf": "15.4.2", + "react-addons-test-utils": "15.4.2", + "react-hot-loader": "3.0.0-beta.6", + "react-intl-aggregate-webpack-plugin": "0.0.1", + "rucksack-css": "0.9.1", + "script-ext-html-webpack-plugin": "1.7.1", + "serviceworker-webpack-plugin": "0.2.0", + "sinon": "1.17.7", + "sinon-as-promised": "4.0.2", + "sinon-chai": "2.8.0", + "style-loader": "0.13.1", + "stylelint": "7.9.0", + "stylelint-config-standard": "16.0.0", + "to-source": "2.0.3", + "url-loader": "0.5.7", + "webpack": "2.2.1", + "webpack-bundle-size-analyzer": "2.5.0", + "webpack-dev-middleware": "1.10.1", + "webpack-error-notification": "0.1.6", + "webpack-hot-middleware": "2.17.1", + "websocket": "1.0.24", + "yargs": "6.6.0" + }, + "dependencies": { + "@parity/wordlist": "1.0.1", + "arraybuffer-loader": "0.2.2", + "babel-runtime": "6.23.0", + "base32.js": "0.1.0", + "bignumber.js": "3.0.1", + "blockies": "0.0.2", + "brace": "0.9.0", + "bytes": "2.4.0", + "date-difference": "1.0.0", + "debounce": "1.0.0", + "es6-error": "4.0.0", + "es6-promise": "4.0.5", + "ethereumjs-tx": "1.2.5", + "eventemitter3": "2.0.2", + "file-saver": "1.3.3", + "flat": "2.0.1", + "format-json": "1.0.3", + "format-number": "2.0.1", + "geopattern": "1.2.3", + "isomorphic-fetch": "2.2.1", + "js-sha3": "0.5.5", + "keythereum": "0.4.6", + "lodash": "4.17.2", + "loglevel": "1.4.1", + "marked": "0.3.6", + "material-ui": "0.16.5", + "material-ui-chip-input": "0.11.1", + "mobx": "2.6.4", + "mobx-react": "4.0.3", + "mobx-react-devtools": "4.2.10", + "moment": "2.17.0", + "napa": "2.3.0", + "phoneformat.js": "1.0.3", + "promise-worker": "1.1.1", + "push.js": "0.0.11", + "qs": "6.3.0", + "react": "15.4.2", + "react-ace": "4.1.0", + "react-addons-css-transition-group": "15.4.2", + "react-codemirror": "^0.3.0", + "react-copy-to-clipboard": "4.2.3", + "react-dom": "15.4.2", + "react-dropzone": "3.7.3", + "react-element-to-jsx-string": "6.0.0", + "react-event-listener": "0.4.1", + "react-inspector": "paritytech/react-inspector", + "react-intl": "2.1.5", + "react-markdown": "2.4.4", + "react-portal": "3.0.0", + "react-qr-reader": "1.1.3", + "react-redux": "4.4.6", + "react-router": "3.0.0", + "react-router-redux": "4.0.7", + "react-tap-event-plugin": "2.0.1", + "react-tooltip": "3.2.2", + "recharts": "0.15.2", + "redux": "3.6.0", + "redux-actions": "1.1.0", + "redux-thunk": "2.1.0", + "rlp": "2.0.0", + "scryptsy": "2.0.0", + "solc": "ngotchac/solc-js", + "store": "1.3.20", + "sw-toolbox": "^3.6.0", + "u2f-api": "0.0.9", + "u2f-api-polyfill": "0.4.3", + "uglify-js": "2.8.16", + "useragent.js": "0.5.6", + "utf8": "2.1.2", + "valid-url": "1.0.9", + "validator": "6.2.0", + "web3": "0.17.0-beta", + "whatwg-fetch": "2.0.1", + "worker-loader": "^0.8.0", + "yarn": "^0.21.3", + "zxcvbn": "4.4.1" + } +} diff --git a/js-old/scripts/build-i18n.js b/js-old/scripts/build-i18n.js new file mode 100644 index 0000000000000000000000000000000000000000..1acf2c852f50c4c369e81009d33f2516ccb9faff --- /dev/null +++ b/js-old/scripts/build-i18n.js @@ -0,0 +1,154 @@ +// 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 . + +const fs = require('fs'); +const _ = require('lodash'); +const path = require('path'); +const toSource = require('to-source'); + +const FILE_HEADER = `// 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 .\n\n`; +const SECTION_HEADER = 'export default '; +const SECTION_FOOTER = ';\n'; +const INDENT = ' '; +const DESTPATH = path.join(__dirname, '../src/i18n/_default'); +const ENPATH = path.join(__dirname, '../src/i18n/en'); +const SRCPATH = path.join(__dirname, '../.build/i18n/i18n/en.json'); + +// main entry point +(function main () { + const { sections, sectionNames } = createSectionMap(); + + sectionNames.forEach((name) => outputSection(name, sections[name])); + outputIndex(sectionNames); +})(); + +// sort an object based on its keys +function sortObject (object) { + return Object + .keys(object) + .sort() + .reduce((sorted, key) => { + if (typeof object[key] === 'object') { + sorted[key] = sortObject(object[key]); + } else { + sorted[key] = object[key]; + } + + return sorted; + }, {}); +} + +// create an object map of the actual inputs +function createSectionMap () { + console.log(`Reading strings from ${SRCPATH}`); + + const i18nstrings = require(SRCPATH); + const sections = sortObject( + Object + .keys(i18nstrings) + .reduce((sections, fullKey) => { + const defaultMessage = i18nstrings[fullKey].defaultMessage; + const keys = fullKey.split('.'); + let outputs = sections; + + keys.forEach((key, index) => { + if (index === keys.length - 1) { + outputs[key] = defaultMessage; + } else { + if (!outputs[key]) { + outputs[key] = {}; + } + + outputs = outputs[key]; + } + }); + + return sections; + }, {}) + ); + const sectionNames = Object.keys(sections); + + console.log(`Found ${sectionNames.length} sections`); + + return { + sections, + sectionNames + }; +} + +// load the available deafults (non-exported strings) for a section +function readDefaults (sectionName) { + let defaults = {}; + + try { + defaults = require(path.join(ENPATH, `${sectionName}.js`)).default; + } catch (error) { + defaults = {}; + } + + return defaults; +} + +// create the index.js file +function outputIndex (sectionNames) { + console.log(`Writing index.js to ${DESTPATH}`); + + const defaults = readDefaults('index'); + const dest = path.join(DESTPATH, 'index.js'); + const exports = _.uniq(Object.keys(defaults).concat(sectionNames)) + .sort() + .map((name) => `export ${name} from './${name}';`) + .join('\n'); + + fs.writeFileSync(dest, `${FILE_HEADER}${exports}\n`, 'utf8'); +} + +// export a section as a flatenned JS export string +function createJSSection (section) { + const source = toSource(section, { + enclose: true, + quoteChar: '`', + tabChar: INDENT, + tabDepth: 0 + }); + + return `${SECTION_HEADER}${source}${SECTION_FOOTER}`; +} + +// create the individual section files +function outputSection (sectionName, section) { + console.log(`Writing ${sectionName}.js to ${DESTPATH}`); + + const defaults = readDefaults(sectionName); + const dest = path.join(DESTPATH, `${sectionName}.js`); + const sectionText = createJSSection(_.defaultsDeep(section, defaults)); + + fs.writeFileSync(dest, `${FILE_HEADER}${sectionText}`, 'utf8'); +} diff --git a/js/scripts/build-rpc-json.js b/js-old/scripts/build-rpc-json.js similarity index 100% rename from js/scripts/build-rpc-json.js rename to js-old/scripts/build-rpc-json.js diff --git a/js/scripts/build-rpc-markdown.js b/js-old/scripts/build-rpc-markdown.js similarity index 100% rename from js/scripts/build-rpc-markdown.js rename to js-old/scripts/build-rpc-markdown.js diff --git a/js-old/scripts/build.sh b/js-old/scripts/build.sh new file mode 100755 index 0000000000000000000000000000000000000000..a6f4a913c02b488940066affd7009e10868f9697 --- /dev/null +++ b/js-old/scripts/build.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +# change into the js directory (one down from scripts) +pushd `dirname $0` +cd .. + +# run build (production) and store the exit code +EXITCODE=0 +BUILDDIR=./.dist +rm -rf $BUILDDIR +mkdir -p $BUILDDIR/src +BUILD_DEST=$BUILDDIR/build npm run ci:build || EXITCODE=1 + +# Copy rust files +cp Cargo.precompiled.toml $BUILDDIR/Cargo.toml +cp build.rs $BUILDDIR +cp src/lib.rs* $BUILDDIR/src + +# back to root +popd + +# exit with exit code +exit $EXITCODE diff --git a/js-old/scripts/dryrun-npm.sh b/js-old/scripts/dryrun-npm.sh new file mode 100755 index 0000000000000000000000000000000000000000..bf8a151a8b08d6bf8b8f9f87a3eca3a5499b1472 --- /dev/null +++ b/js-old/scripts/dryrun-npm.sh @@ -0,0 +1,36 @@ +#!/bin/bash +set -e + +# variables +PACKAGES=( "parity" "etherscan" "shapeshift" "jsonrpc" ) + +# change into the build directory +BASEDIR=`dirname $0` +cd $BASEDIR/.. + +# build jsonrpc +echo "*** Building JSONRPC .json" +mkdir -p .npmjs/jsonrpc +npm run ci:build:jsonrpc + +# build all packages +echo "*** Building packages for npmjs" +echo "$NPM_TOKEN" >> ~/.npmrc + +for PACKAGE in ${PACKAGES[@]} +do + echo "*** Building $PACKAGE" + LIBRARY=$PACKAGE npm run ci:build:npm + DIRECTORY=.npmjs/$PACKAGE + + cd $DIRECTORY + + echo "*** Publishing $PACKAGE from $DIRECTORY" + echo "npm publish --access public || true" + cd ../.. + +done +cd .. + +# exit with exit code +exit 0 diff --git a/js/scripts/helpers/log.js b/js-old/scripts/helpers/log.js similarity index 100% rename from js/scripts/helpers/log.js rename to js-old/scripts/helpers/log.js diff --git a/js/scripts/helpers/parsed-rpc-traits.js b/js-old/scripts/helpers/parsed-rpc-traits.js similarity index 100% rename from js/scripts/helpers/parsed-rpc-traits.js rename to js-old/scripts/helpers/parsed-rpc-traits.js diff --git a/js-old/scripts/install-deps.sh b/js-old/scripts/install-deps.sh new file mode 100755 index 0000000000000000000000000000000000000000..96c2f36b11cef4e927f5f234d849b27bb983e4e4 --- /dev/null +++ b/js-old/scripts/install-deps.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# change into the js directory (one down from scripts) +pushd `dirname $0` +cd .. + +# install deps and store the exit code +EXITCODE=0 +node --version +npm --version +npm install --progress=false || EXITCODE=1 + +# back to root +popd + +# exit with exit code +exit $EXITCODE diff --git a/js-old/scripts/lint-i18n.js b/js-old/scripts/lint-i18n.js new file mode 100644 index 0000000000000000000000000000000000000000..d392353d0e0ee887f0f30dfe96855e7a57b5f434 --- /dev/null +++ b/js-old/scripts/lint-i18n.js @@ -0,0 +1,53 @@ +// 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 . + +import flatten from 'flat'; + +import * as defaults from '../src/i18n/_default'; +import { LANGUAGES, MESSAGES } from '../src/i18n/store'; + +const SKIP_LANG = ['en']; +const defaultKeys = Object.keys(flatten(Object.assign({}, defaults, LANGUAGES))); + +Object + .keys(MESSAGES) + .filter((lang) => !SKIP_LANG.includes(lang)) + .forEach((lang) => { + const messageKeys = Object.keys(MESSAGES[lang]); + let extra = 0; + let found = 0; + let missing = 0; + + console.log(`*** Checking translations for ${lang}`); + + defaultKeys.forEach((key) => { + if (messageKeys.includes(key)) { + found++; + } else { + missing++; + console.log(` Missing ${key}`); + } + }); + + messageKeys.forEach((key) => { + if (!defaultKeys.includes(key)) { + extra++; + console.log(` Extra ${key}`); + } + }); + + console.log(`Found ${found} keys, missing ${missing} keys, ${extra} extraneous keys\n`); + }); diff --git a/js-old/scripts/lint.sh b/js-old/scripts/lint.sh new file mode 100755 index 0000000000000000000000000000000000000000..147bb0a2d01fd36bc94cabba51e3eba947e42824 --- /dev/null +++ b/js-old/scripts/lint.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# change into the js directory (one down from scripts) +pushd `dirname $0` +cd .. + +# run lint & tests and store the exit code +EXITCODE=0 +npm run lint || EXITCODE=1 + +# back to root +popd + +# exit with exit code +exit $EXITCODE diff --git a/js-old/scripts/release.sh b/js-old/scripts/release.sh new file mode 100755 index 0000000000000000000000000000000000000000..ad381eb2c384ebdc2e5815283fb412a48051f1f9 --- /dev/null +++ b/js-old/scripts/release.sh @@ -0,0 +1,79 @@ +#!/bin/bash +set -e + +# variables +UTCDATE=`date -u "+%Y%m%d-%H%M%S"` +PACKAGES=( "parity" "etherscan" "shapeshift" "jsonrpc" ) +BRANCH="v1" +GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/js-precompiled.git" +GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/paritytech/parity.git" + +# setup the git user defaults for the current repo +function setup_git_user { + git config push.default simple + git config merge.ours.driver true + git config user.email "$GITHUB_EMAIL" + git config user.name "GitLab Build Bot" +} + +# change into the build directory +BASEDIR=`dirname $0` +GITLOG=./.git/gitcommand.log +pushd $BASEDIR +cd ../.dist + +# add local files and send it up +echo "*** Setting up GitHub config for js-precompiled" +rm -rf ./.git +git init +setup_git_user + +echo "*** Checking out $BRANCH branch" +git remote add origin $GIT_JS_PRECOMPILED +git fetch origin 2>$GITLOG +git checkout -b $BRANCH + +echo "*** Committing compiled files for $UTCDATE" +mv build ../build.new +git add . +git commit -m "$UTCDATE [update]" +git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [merge]" +git rm -r build +rm -rf build +git commit -m "$UTCDATE [cleanup]" +mv ../build.new build +git add . +git commit -m "$UTCDATE [release]" + +echo "*** Merging remote" +git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG +PRECOMPILED_HASH=`git rev-parse HEAD` + +# move to root +cd ../.. + +echo "*** Setting up GitHub config for parity" +setup_git_user +git remote set-url origin $GIT_PARITY +git reset --hard origin/$BRANCH 2>$GITLOG + +echo "*** Updating cargo parity-ui-old-precompiled#$PRECOMPILED_HASH" +git submodule update +# Not needed since $BRANCH is hardcoded +# sed -i "/^parity-ui-old-precompiled/ { s/branch = \".*\"/branch = \"$BRANCH\"/g; }" dapps/ui/Cargo.toml +cargo update -p parity-ui-old-precompiled +# --precise "$PRECOMPILED_HASH" + +echo "*** Committing updated files" +git add js +git add dapps/ui/Cargo.toml +git add Cargo.lock +git commit -m "[ci skip] js-precompiled $UTCDATE" +git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG + +# back to root +echo "*** Release completed" +popd + +# exit with exit code +exit 0 diff --git a/js-old/scripts/test.js b/js-old/scripts/test.js new file mode 100644 index 0000000000000000000000000000000000000000..e426642db0b0e95332b63cbe52e72feddab150b7 --- /dev/null +++ b/js-old/scripts/test.js @@ -0,0 +1 @@ +// test script 10 diff --git a/js-old/scripts/test.sh b/js-old/scripts/test.sh new file mode 100755 index 0000000000000000000000000000000000000000..6827b243ca64bdacd03691100dafc65a68bc5e65 --- /dev/null +++ b/js-old/scripts/test.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +# change into the js directory (one down from scripts) +pushd `dirname $0` +cd .. + +# run lint & tests and store the exit code +EXITCODE=0 +npm run test || EXITCODE=1 + +# back to root +popd + +# exit with exit code +exit $EXITCODE diff --git a/js-old/scripts/update-precompiled.sh b/js-old/scripts/update-precompiled.sh new file mode 100755 index 0000000000000000000000000000000000000000..ebbab50462632a9fb9a53bc83f0e45d9aca49ead --- /dev/null +++ b/js-old/scripts/update-precompiled.sh @@ -0,0 +1,11 @@ +#!/bin/bash +set -e + +# change into main dir +pushd `dirname $0` +cd ../../ + +cargo update -p parity-ui-old-precompiled + +popd +exit 0 diff --git a/js/src/3rdparty/email-verification/index.js b/js-old/src/3rdparty/email-verification/index.js similarity index 100% rename from js/src/3rdparty/email-verification/index.js rename to js-old/src/3rdparty/email-verification/index.js diff --git a/js/src/3rdparty/email-verification/terms-of-service.js b/js-old/src/3rdparty/email-verification/terms-of-service.js similarity index 100% rename from js/src/3rdparty/email-verification/terms-of-service.js rename to js-old/src/3rdparty/email-verification/terms-of-service.js diff --git a/js/src/3rdparty/etherscan/account.js b/js-old/src/3rdparty/etherscan/account.js similarity index 100% rename from js/src/3rdparty/etherscan/account.js rename to js-old/src/3rdparty/etherscan/account.js diff --git a/js/src/3rdparty/etherscan/account.spec.js b/js-old/src/3rdparty/etherscan/account.spec.js similarity index 100% rename from js/src/3rdparty/etherscan/account.spec.js rename to js-old/src/3rdparty/etherscan/account.spec.js diff --git a/js/src/3rdparty/etherscan/call.js b/js-old/src/3rdparty/etherscan/call.js similarity index 100% rename from js/src/3rdparty/etherscan/call.js rename to js-old/src/3rdparty/etherscan/call.js diff --git a/js/src/3rdparty/etherscan/helpers.spec.js b/js-old/src/3rdparty/etherscan/helpers.spec.js similarity index 100% rename from js/src/3rdparty/etherscan/helpers.spec.js rename to js-old/src/3rdparty/etherscan/helpers.spec.js diff --git a/js/src/3rdparty/etherscan/index.js b/js-old/src/3rdparty/etherscan/index.js similarity index 100% rename from js/src/3rdparty/etherscan/index.js rename to js-old/src/3rdparty/etherscan/index.js diff --git a/js/src/3rdparty/etherscan/links.js b/js-old/src/3rdparty/etherscan/links.js similarity index 100% rename from js/src/3rdparty/etherscan/links.js rename to js-old/src/3rdparty/etherscan/links.js diff --git a/js/src/3rdparty/etherscan/links.spec.js b/js-old/src/3rdparty/etherscan/links.spec.js similarity index 100% rename from js/src/3rdparty/etherscan/links.spec.js rename to js-old/src/3rdparty/etherscan/links.spec.js diff --git a/js/src/3rdparty/etherscan/stats.js b/js-old/src/3rdparty/etherscan/stats.js similarity index 100% rename from js/src/3rdparty/etherscan/stats.js rename to js-old/src/3rdparty/etherscan/stats.js diff --git a/js/src/3rdparty/etherscan/stats.spec.js b/js-old/src/3rdparty/etherscan/stats.spec.js similarity index 100% rename from js/src/3rdparty/etherscan/stats.spec.js rename to js-old/src/3rdparty/etherscan/stats.spec.js diff --git a/js/src/3rdparty/ledger/index.js b/js-old/src/3rdparty/ledger/index.js similarity index 100% rename from js/src/3rdparty/ledger/index.js rename to js-old/src/3rdparty/ledger/index.js diff --git a/js/src/3rdparty/ledger/ledger.js b/js-old/src/3rdparty/ledger/ledger.js similarity index 100% rename from js/src/3rdparty/ledger/ledger.js rename to js-old/src/3rdparty/ledger/ledger.js diff --git a/js/src/3rdparty/ledger/ledger.spec.js b/js-old/src/3rdparty/ledger/ledger.spec.js similarity index 100% rename from js/src/3rdparty/ledger/ledger.spec.js rename to js-old/src/3rdparty/ledger/ledger.spec.js diff --git a/js/src/3rdparty/ledger/vendor/README.md b/js-old/src/3rdparty/ledger/vendor/README.md similarity index 100% rename from js/src/3rdparty/ledger/vendor/README.md rename to js-old/src/3rdparty/ledger/vendor/README.md diff --git a/js/src/3rdparty/ledger/vendor/ledger-eth.js b/js-old/src/3rdparty/ledger/vendor/ledger-eth.js similarity index 100% rename from js/src/3rdparty/ledger/vendor/ledger-eth.js rename to js-old/src/3rdparty/ledger/vendor/ledger-eth.js diff --git a/js/src/3rdparty/ledger/vendor/ledger3.js b/js-old/src/3rdparty/ledger/vendor/ledger3.js similarity index 100% rename from js/src/3rdparty/ledger/vendor/ledger3.js rename to js-old/src/3rdparty/ledger/vendor/ledger3.js diff --git a/js/src/3rdparty/shapeshift/helpers.spec.js b/js-old/src/3rdparty/shapeshift/helpers.spec.js similarity index 100% rename from js/src/3rdparty/shapeshift/helpers.spec.js rename to js-old/src/3rdparty/shapeshift/helpers.spec.js diff --git a/js/src/3rdparty/shapeshift/index.js b/js-old/src/3rdparty/shapeshift/index.js similarity index 100% rename from js/src/3rdparty/shapeshift/index.js rename to js-old/src/3rdparty/shapeshift/index.js diff --git a/js/src/3rdparty/shapeshift/rpc.js b/js-old/src/3rdparty/shapeshift/rpc.js similarity index 100% rename from js/src/3rdparty/shapeshift/rpc.js rename to js-old/src/3rdparty/shapeshift/rpc.js diff --git a/js/src/3rdparty/shapeshift/rpc.spec.js b/js-old/src/3rdparty/shapeshift/rpc.spec.js similarity index 100% rename from js/src/3rdparty/shapeshift/rpc.spec.js rename to js-old/src/3rdparty/shapeshift/rpc.spec.js diff --git a/js/src/3rdparty/shapeshift/shapeshift.js b/js-old/src/3rdparty/shapeshift/shapeshift.js similarity index 100% rename from js/src/3rdparty/shapeshift/shapeshift.js rename to js-old/src/3rdparty/shapeshift/shapeshift.js diff --git a/js/src/3rdparty/shapeshift/shapeshift.spec.js b/js-old/src/3rdparty/shapeshift/shapeshift.spec.js similarity index 100% rename from js/src/3rdparty/shapeshift/shapeshift.spec.js rename to js-old/src/3rdparty/shapeshift/shapeshift.spec.js diff --git a/js/src/3rdparty/sms-verification/index.js b/js-old/src/3rdparty/sms-verification/index.js similarity index 100% rename from js/src/3rdparty/sms-verification/index.js rename to js-old/src/3rdparty/sms-verification/index.js diff --git a/js/src/3rdparty/sms-verification/terms-of-service.js b/js-old/src/3rdparty/sms-verification/terms-of-service.js similarity index 100% rename from js/src/3rdparty/sms-verification/terms-of-service.js rename to js-old/src/3rdparty/sms-verification/terms-of-service.js diff --git a/js/src/abi/README.md b/js-old/src/abi/README.md similarity index 100% rename from js/src/abi/README.md rename to js-old/src/abi/README.md diff --git a/js/src/abi/abi.js b/js-old/src/abi/abi.js similarity index 100% rename from js/src/abi/abi.js rename to js-old/src/abi/abi.js diff --git a/js/src/abi/decoder/bytesTaken.js b/js-old/src/abi/decoder/bytesTaken.js similarity index 100% rename from js/src/abi/decoder/bytesTaken.js rename to js-old/src/abi/decoder/bytesTaken.js diff --git a/js/src/abi/decoder/bytesTaken.spec.js b/js-old/src/abi/decoder/bytesTaken.spec.js similarity index 100% rename from js/src/abi/decoder/bytesTaken.spec.js rename to js-old/src/abi/decoder/bytesTaken.spec.js diff --git a/js/src/abi/decoder/decodeResult.js b/js-old/src/abi/decoder/decodeResult.js similarity index 100% rename from js/src/abi/decoder/decodeResult.js rename to js-old/src/abi/decoder/decodeResult.js diff --git a/js/src/abi/decoder/decodeResult.spec.js b/js-old/src/abi/decoder/decodeResult.spec.js similarity index 100% rename from js/src/abi/decoder/decodeResult.spec.js rename to js-old/src/abi/decoder/decodeResult.spec.js diff --git a/js/src/abi/decoder/decoder.js b/js-old/src/abi/decoder/decoder.js similarity index 100% rename from js/src/abi/decoder/decoder.js rename to js-old/src/abi/decoder/decoder.js diff --git a/js/src/abi/decoder/decoder.spec.js b/js-old/src/abi/decoder/decoder.spec.js similarity index 100% rename from js/src/abi/decoder/decoder.spec.js rename to js-old/src/abi/decoder/decoder.spec.js diff --git a/js/src/abi/decoder/index.js b/js-old/src/abi/decoder/index.js similarity index 100% rename from js/src/abi/decoder/index.js rename to js-old/src/abi/decoder/index.js diff --git a/js/src/abi/encoder/encoder.js b/js-old/src/abi/encoder/encoder.js similarity index 100% rename from js/src/abi/encoder/encoder.js rename to js-old/src/abi/encoder/encoder.js diff --git a/js/src/abi/encoder/encoder.spec.js b/js-old/src/abi/encoder/encoder.spec.js similarity index 100% rename from js/src/abi/encoder/encoder.spec.js rename to js-old/src/abi/encoder/encoder.spec.js diff --git a/js/src/abi/encoder/index.js b/js-old/src/abi/encoder/index.js similarity index 100% rename from js/src/abi/encoder/index.js rename to js-old/src/abi/encoder/index.js diff --git a/js/src/abi/encoder/mediate.js b/js-old/src/abi/encoder/mediate.js similarity index 100% rename from js/src/abi/encoder/mediate.js rename to js-old/src/abi/encoder/mediate.js diff --git a/js/src/abi/encoder/mediate.spec.js b/js-old/src/abi/encoder/mediate.spec.js similarity index 100% rename from js/src/abi/encoder/mediate.spec.js rename to js-old/src/abi/encoder/mediate.spec.js diff --git a/js/src/abi/index.js b/js-old/src/abi/index.js similarity index 100% rename from js/src/abi/index.js rename to js-old/src/abi/index.js diff --git a/js/src/abi/spec/constructor.js b/js-old/src/abi/spec/constructor.js similarity index 100% rename from js/src/abi/spec/constructor.js rename to js-old/src/abi/spec/constructor.js diff --git a/js/src/abi/spec/constructor.spec.js b/js-old/src/abi/spec/constructor.spec.js similarity index 100% rename from js/src/abi/spec/constructor.spec.js rename to js-old/src/abi/spec/constructor.spec.js diff --git a/js/src/abi/spec/event/decodedLog.js b/js-old/src/abi/spec/event/decodedLog.js similarity index 100% rename from js/src/abi/spec/event/decodedLog.js rename to js-old/src/abi/spec/event/decodedLog.js diff --git a/js/src/abi/spec/event/decodedLog.spec.js b/js-old/src/abi/spec/event/decodedLog.spec.js similarity index 100% rename from js/src/abi/spec/event/decodedLog.spec.js rename to js-old/src/abi/spec/event/decodedLog.spec.js diff --git a/js/src/abi/spec/event/decodedLogParam.js b/js-old/src/abi/spec/event/decodedLogParam.js similarity index 100% rename from js/src/abi/spec/event/decodedLogParam.js rename to js-old/src/abi/spec/event/decodedLogParam.js diff --git a/js/src/abi/spec/event/decodedLogParam.spec.js b/js-old/src/abi/spec/event/decodedLogParam.spec.js similarity index 100% rename from js/src/abi/spec/event/decodedLogParam.spec.js rename to js-old/src/abi/spec/event/decodedLogParam.spec.js diff --git a/js/src/abi/spec/event/event.js b/js-old/src/abi/spec/event/event.js similarity index 100% rename from js/src/abi/spec/event/event.js rename to js-old/src/abi/spec/event/event.js diff --git a/js/src/abi/spec/event/event.spec.js b/js-old/src/abi/spec/event/event.spec.js similarity index 100% rename from js/src/abi/spec/event/event.spec.js rename to js-old/src/abi/spec/event/event.spec.js diff --git a/js/src/abi/spec/event/eventParam.js b/js-old/src/abi/spec/event/eventParam.js similarity index 100% rename from js/src/abi/spec/event/eventParam.js rename to js-old/src/abi/spec/event/eventParam.js diff --git a/js/src/abi/spec/event/eventParam.spec.js b/js-old/src/abi/spec/event/eventParam.spec.js similarity index 100% rename from js/src/abi/spec/event/eventParam.spec.js rename to js-old/src/abi/spec/event/eventParam.spec.js diff --git a/js/src/abi/spec/event/index.js b/js-old/src/abi/spec/event/index.js similarity index 100% rename from js/src/abi/spec/event/index.js rename to js-old/src/abi/spec/event/index.js diff --git a/js/src/abi/spec/function.js b/js-old/src/abi/spec/function.js similarity index 100% rename from js/src/abi/spec/function.js rename to js-old/src/abi/spec/function.js diff --git a/js/src/abi/spec/function.spec.js b/js-old/src/abi/spec/function.spec.js similarity index 100% rename from js/src/abi/spec/function.spec.js rename to js-old/src/abi/spec/function.spec.js diff --git a/js/src/abi/spec/index.js b/js-old/src/abi/spec/index.js similarity index 100% rename from js/src/abi/spec/index.js rename to js-old/src/abi/spec/index.js diff --git a/js/src/abi/spec/interface.js b/js-old/src/abi/spec/interface.js similarity index 100% rename from js/src/abi/spec/interface.js rename to js-old/src/abi/spec/interface.js diff --git a/js/src/abi/spec/interface.spec.js b/js-old/src/abi/spec/interface.spec.js similarity index 100% rename from js/src/abi/spec/interface.spec.js rename to js-old/src/abi/spec/interface.spec.js diff --git a/js/src/abi/spec/param.js b/js-old/src/abi/spec/param.js similarity index 100% rename from js/src/abi/spec/param.js rename to js-old/src/abi/spec/param.js diff --git a/js/src/abi/spec/param.spec.js b/js-old/src/abi/spec/param.spec.js similarity index 100% rename from js/src/abi/spec/param.spec.js rename to js-old/src/abi/spec/param.spec.js diff --git a/js/src/abi/spec/paramType/format.js b/js-old/src/abi/spec/paramType/format.js similarity index 100% rename from js/src/abi/spec/paramType/format.js rename to js-old/src/abi/spec/paramType/format.js diff --git a/js/src/abi/spec/paramType/format.spec.js b/js-old/src/abi/spec/paramType/format.spec.js similarity index 100% rename from js/src/abi/spec/paramType/format.spec.js rename to js-old/src/abi/spec/paramType/format.spec.js diff --git a/js/src/abi/spec/paramType/index.js b/js-old/src/abi/spec/paramType/index.js similarity index 100% rename from js/src/abi/spec/paramType/index.js rename to js-old/src/abi/spec/paramType/index.js diff --git a/js/src/abi/spec/paramType/paramType.js b/js-old/src/abi/spec/paramType/paramType.js similarity index 100% rename from js/src/abi/spec/paramType/paramType.js rename to js-old/src/abi/spec/paramType/paramType.js diff --git a/js/src/abi/spec/paramType/paramType.spec.js b/js-old/src/abi/spec/paramType/paramType.spec.js similarity index 100% rename from js/src/abi/spec/paramType/paramType.spec.js rename to js-old/src/abi/spec/paramType/paramType.spec.js diff --git a/js/src/abi/spec/paramType/types.js b/js-old/src/abi/spec/paramType/types.js similarity index 100% rename from js/src/abi/spec/paramType/types.js rename to js-old/src/abi/spec/paramType/types.js diff --git a/js/src/abi/token/index.js b/js-old/src/abi/token/index.js similarity index 100% rename from js/src/abi/token/index.js rename to js-old/src/abi/token/index.js diff --git a/js/src/abi/token/token.js b/js-old/src/abi/token/token.js similarity index 100% rename from js/src/abi/token/token.js rename to js-old/src/abi/token/token.js diff --git a/js/src/abi/token/token.spec.js b/js-old/src/abi/token/token.spec.js similarity index 100% rename from js/src/abi/token/token.spec.js rename to js-old/src/abi/token/token.spec.js diff --git a/js/src/abi/util/address.js b/js-old/src/abi/util/address.js similarity index 100% rename from js/src/abi/util/address.js rename to js-old/src/abi/util/address.js diff --git a/js/src/abi/util/address.spec.js b/js-old/src/abi/util/address.spec.js similarity index 100% rename from js/src/abi/util/address.spec.js rename to js-old/src/abi/util/address.spec.js diff --git a/js/src/abi/util/pad.js b/js-old/src/abi/util/pad.js similarity index 100% rename from js/src/abi/util/pad.js rename to js-old/src/abi/util/pad.js diff --git a/js/src/abi/util/pad.spec.js b/js-old/src/abi/util/pad.spec.js similarity index 100% rename from js/src/abi/util/pad.spec.js rename to js-old/src/abi/util/pad.spec.js diff --git a/js/src/abi/util/signature.js b/js-old/src/abi/util/signature.js similarity index 100% rename from js/src/abi/util/signature.js rename to js-old/src/abi/util/signature.js diff --git a/js/src/abi/util/signature.spec.js b/js-old/src/abi/util/signature.spec.js similarity index 100% rename from js/src/abi/util/signature.spec.js rename to js-old/src/abi/util/signature.spec.js diff --git a/js/src/abi/util/slice.js b/js-old/src/abi/util/slice.js similarity index 100% rename from js/src/abi/util/slice.js rename to js-old/src/abi/util/slice.js diff --git a/js/src/abi/util/slice.spec.js b/js-old/src/abi/util/slice.spec.js similarity index 100% rename from js/src/abi/util/slice.spec.js rename to js-old/src/abi/util/slice.spec.js diff --git a/js/src/abi/util/sliceAs.js b/js-old/src/abi/util/sliceAs.js similarity index 100% rename from js/src/abi/util/sliceAs.js rename to js-old/src/abi/util/sliceAs.js diff --git a/js/src/abi/util/sliceAs.spec.js b/js-old/src/abi/util/sliceAs.spec.js similarity index 100% rename from js/src/abi/util/sliceAs.spec.js rename to js-old/src/abi/util/sliceAs.spec.js diff --git a/js/src/abi/util/types.js b/js-old/src/abi/util/types.js similarity index 100% rename from js/src/abi/util/types.js rename to js-old/src/abi/util/types.js diff --git a/js/src/abi/util/types.spec.js b/js-old/src/abi/util/types.spec.js similarity index 100% rename from js/src/abi/util/types.spec.js rename to js-old/src/abi/util/types.spec.js diff --git a/js/src/api/README.md b/js-old/src/api/README.md similarity index 100% rename from js/src/api/README.md rename to js-old/src/api/README.md diff --git a/js/src/api/api.js b/js-old/src/api/api.js similarity index 98% rename from js/src/api/api.js rename to js-old/src/api/api.js index 5ba401c33621b5a4e0177259664c408557d22187..220c3be294158d1ba2fcd93c60ab1382a1cece02 100644 --- a/js/src/api/api.js +++ b/js-old/src/api/api.js @@ -47,6 +47,13 @@ export default class Api extends EventEmitter { this._trace = new Trace(transport); this._web3 = new Web3(transport); + if (isFunction(transport.subscribe)) { + this._pubsub = new Pubsub(transport); + } + + if (allowSubscriptions) { + this._subscriptions = new Subscriptions(this); + } // Doing a request here in test env would cause an error if (LocalAccountsMiddleware && process.env.NODE_ENV !== 'test') { const middleware = this.parity @@ -62,25 +69,12 @@ export default class Api extends EventEmitter { transport.addMiddleware(middleware); } - - if (isFunction(transport.subscribe)) { - this._pubsub = new Pubsub(transport); - } - - if (allowSubscriptions) { - this._subscriptions = new Subscriptions(this); - } - } - - get isPubSub () { - return !!this._pubsub; } get pubsub () { - if (!this.isPubSub) { + if (!this._pubsub) { throw Error('Pubsub is only available with a subscribing-supported transport injected!'); } - return this._pubsub; } diff --git a/js/src/api/api.spec.js b/js-old/src/api/api.spec.js similarity index 100% rename from js/src/api/api.spec.js rename to js-old/src/api/api.spec.js diff --git a/js/src/api/contract/contract.js b/js-old/src/api/contract/contract.js similarity index 98% rename from js/src/api/contract/contract.js rename to js-old/src/api/contract/contract.js index b16b92ae6d435a5550de1cb9bb008f25f99a2b51..dee4d6d777b6405ead63261d3db8a24bf8368c14 100644 --- a/js/src/api/contract/contract.js +++ b/js-old/src/api/contract/contract.js @@ -134,10 +134,8 @@ export default class Contract { return this._api.parity .postTransaction(encodedOptions) .then((requestId) => { - if (requestId.length !== 66) { - statecb(null, { state: 'checkRequest', requestId }); - return this._pollCheckRequest(requestId); - } else { return requestId; } + statecb(null, { state: 'checkRequest', requestId }); + return this._pollCheckRequest(requestId); }) .then((txhash) => { statecb(null, { state: 'getTransactionReceipt', txhash }); diff --git a/js/src/api/contract/contract.spec.js b/js-old/src/api/contract/contract.spec.js similarity index 100% rename from js/src/api/contract/contract.spec.js rename to js-old/src/api/contract/contract.spec.js diff --git a/js/src/api/contract/index.js b/js-old/src/api/contract/index.js similarity index 100% rename from js/src/api/contract/index.js rename to js-old/src/api/contract/index.js diff --git a/js/src/api/format/input.js b/js-old/src/api/format/input.js similarity index 100% rename from js/src/api/format/input.js rename to js-old/src/api/format/input.js diff --git a/js/src/api/format/input.spec.js b/js-old/src/api/format/input.spec.js similarity index 100% rename from js/src/api/format/input.spec.js rename to js-old/src/api/format/input.spec.js diff --git a/js/src/api/format/output.js b/js-old/src/api/format/output.js similarity index 100% rename from js/src/api/format/output.js rename to js-old/src/api/format/output.js diff --git a/js/src/api/format/output.spec.js b/js-old/src/api/format/output.spec.js similarity index 100% rename from js/src/api/format/output.spec.js rename to js-old/src/api/format/output.spec.js diff --git a/js/src/api/index.js b/js-old/src/api/index.js similarity index 100% rename from js/src/api/index.js rename to js-old/src/api/index.js diff --git a/js/src/api/local/accounts/account.js b/js-old/src/api/local/accounts/account.js similarity index 100% rename from js/src/api/local/accounts/account.js rename to js-old/src/api/local/accounts/account.js diff --git a/js/src/api/local/accounts/accounts.js b/js-old/src/api/local/accounts/accounts.js similarity index 96% rename from js/src/api/local/accounts/accounts.js rename to js-old/src/api/local/accounts/accounts.js index ec117e25d9134a19f8a0ce000ffe1e34c0e97749..d11ea2badb65c571dea36bb45bda8b4196b5c787 100644 --- a/js/src/api/local/accounts/accounts.js +++ b/js-old/src/api/local/accounts/accounts.js @@ -18,12 +18,11 @@ import Account from './account'; import localStore from 'store'; import { debounce } from 'lodash'; import { decryptPrivateKey } from '../ethkey'; -import EventEmitter from 'eventemitter3'; const NULL_ADDRESS = '0x0000000000000000000000000000000000000000'; const LS_STORE_KEY = '_parity::localAccounts'; -export default class Accounts extends EventEmitter { +export default class Accounts { persist = debounce(() => { this._lastState = JSON.stringify(this); @@ -31,8 +30,6 @@ export default class Accounts extends EventEmitter { }, 100); constructor (data = localStore.get(LS_STORE_KEY) || {}) { - super(); - this._lastState = JSON.stringify(data); window.addEventListener('storage', ({ key, newValue }) => { @@ -133,8 +130,6 @@ export default class Accounts extends EventEmitter { set dappsDefaultAddress (value) { this._dappsDefaultAddress = value.toLowerCase(); - this.emit('dappsDefaultAddressChange', this._dappsDefaultAddress); - this.persist(); } diff --git a/js/src/api/local/accounts/index.js b/js-old/src/api/local/accounts/index.js similarity index 100% rename from js/src/api/local/accounts/index.js rename to js-old/src/api/local/accounts/index.js diff --git a/js/src/api/local/ethkey/ethkey.js b/js-old/src/api/local/ethkey/ethkey.js similarity index 100% rename from js/src/api/local/ethkey/ethkey.js rename to js-old/src/api/local/ethkey/ethkey.js diff --git a/js/src/api/local/ethkey/ethkey.wasm.js b/js-old/src/api/local/ethkey/ethkey.wasm.js similarity index 100% rename from js/src/api/local/ethkey/ethkey.wasm.js rename to js-old/src/api/local/ethkey/ethkey.wasm.js diff --git a/js/src/api/local/ethkey/index.js b/js-old/src/api/local/ethkey/index.js similarity index 100% rename from js/src/api/local/ethkey/index.js rename to js-old/src/api/local/ethkey/index.js diff --git a/js/src/api/local/ethkey/index.spec.js b/js-old/src/api/local/ethkey/index.spec.js similarity index 100% rename from js/src/api/local/ethkey/index.spec.js rename to js-old/src/api/local/ethkey/index.spec.js diff --git a/js/src/api/local/ethkey/worker.js b/js-old/src/api/local/ethkey/worker.js similarity index 100% rename from js/src/api/local/ethkey/worker.js rename to js-old/src/api/local/ethkey/worker.js diff --git a/js/src/api/local/ethkey/workerPool.js b/js-old/src/api/local/ethkey/workerPool.js similarity index 100% rename from js/src/api/local/ethkey/workerPool.js rename to js-old/src/api/local/ethkey/workerPool.js diff --git a/js/src/api/local/index.js b/js-old/src/api/local/index.js similarity index 100% rename from js/src/api/local/index.js rename to js-old/src/api/local/index.js diff --git a/js/src/api/local/localAccountsMiddleware.js b/js-old/src/api/local/localAccountsMiddleware.js similarity index 90% rename from js/src/api/local/localAccountsMiddleware.js rename to js-old/src/api/local/localAccountsMiddleware.js index bc18f21b1b7025577ef384be2a7c3926168ebf75..c452f541afa5fcb332ccb1b465b4ec86908b83f5 100644 --- a/js/src/api/local/localAccountsMiddleware.js +++ b/js-old/src/api/local/localAccountsMiddleware.js @@ -26,9 +26,7 @@ export default class LocalAccountsMiddleware extends Middleware { constructor (transport) { super(transport); - const NOOP = () => {}; const register = this.register.bind(this); - const registerSubscribe = this.registerSubscribe.bind(this); register('eth_accounts', () => { return accounts.accountAddresses(); @@ -78,14 +76,6 @@ export default class LocalAccountsMiddleware extends Middleware { return accounts.dappsDefaultAddress; }); - registerSubscribe('parity_defaultAccount', (_, callback) => { - callback(null, accounts.dappsDefaultAddress); - - accounts.on('dappsDefaultAddressChange', (address) => { - callback(null, accounts.dappsDefaultAddress); - }); - }); - register('parity_exportAccount', ([address, password]) => { const account = accounts.get(address); @@ -119,8 +109,6 @@ export default class LocalAccountsMiddleware extends Middleware { return {}; }); - registerSubscribe('parity_hardwareAccountsInfo', NOOP); - register('parity_newAccountFromPhrase', ([phrase, password]) => { return phraseToWallet(phrase) .then((wallet) => { @@ -200,8 +188,14 @@ export default class LocalAccountsMiddleware extends Middleware { return []; }); - register('parity_lockedHardwareAccountsInfo', () => { - return []; + register('parity_wsUrl', () => { + // This is a hack, will be replaced by a `hostname` setting on the node itself + return `${window.location.hostname}:8546`; + }); + + register('parity_dappsUrl', () => { + // This is a hack, will be replaced by a `hostname` setting on the node itself + return `${window.location.hostname}:8545`; }); register('parity_hashContent', () => { @@ -290,15 +284,5 @@ export default class LocalAccountsMiddleware extends Middleware { register('signer_requestsToConfirm', () => { return transactions.requestsToConfirm(); }); - - registerSubscribe('signer_subscribePending', (_, callback) => { - callback(null, transactions.requestsToConfirm()); - - transactions.on('update', () => { - callback(null, transactions.requestsToConfirm()); - }); - - return false; - }); } } diff --git a/js/src/api/local/localAccountsMiddleware.spec.js b/js-old/src/api/local/localAccountsMiddleware.spec.js similarity index 100% rename from js/src/api/local/localAccountsMiddleware.spec.js rename to js-old/src/api/local/localAccountsMiddleware.spec.js diff --git a/js/src/api/local/transactions.js b/js-old/src/api/local/transactions.js similarity index 93% rename from js/src/api/local/transactions.js rename to js-old/src/api/local/transactions.js index 44cf61f69f4b3e01a7668f4ba6799f51ac4bfa8d..421e730123d9eadb6ecd3d0140a1bc53d1d4e986 100644 --- a/js/src/api/local/transactions.js +++ b/js-old/src/api/local/transactions.js @@ -16,17 +16,14 @@ import { toHex } from '../util/format'; import { TransportError } from '../transport'; -import EventEmitter from 'eventemitter3'; const AWAITING = Symbol('awaiting'); const LOCKED = Symbol('locked'); const CONFIRMED = Symbol('confirmed'); const REJECTED = Symbol('rejected'); -class Transactions extends EventEmitter { +class Transactions { constructor () { - super(); - this.reset(); } @@ -48,8 +45,6 @@ class Transactions extends EventEmitter { transaction: tx }; - this.emit('update'); - return id; } @@ -71,8 +66,6 @@ class Transactions extends EventEmitter { } state.status = LOCKED; - - this.emit('update'); } unlock (id) { @@ -83,8 +76,6 @@ class Transactions extends EventEmitter { } state.status = AWAITING; - - this.emit('update'); } hash (id) { @@ -116,8 +107,6 @@ class Transactions extends EventEmitter { state.hash = hash; state.status = CONFIRMED; - - this.emit('update'); } reject (id) { @@ -129,8 +118,6 @@ class Transactions extends EventEmitter { state.status = REJECTED; - this.emit('update'); - return true; } diff --git a/js/src/api/local/transactions.spec.js b/js-old/src/api/local/transactions.spec.js similarity index 100% rename from js/src/api/local/transactions.spec.js rename to js-old/src/api/local/transactions.spec.js diff --git a/js/src/api/pubsub/eth/eth.js b/js-old/src/api/pubsub/eth/eth.js similarity index 99% rename from js/src/api/pubsub/eth/eth.js rename to js-old/src/api/pubsub/eth/eth.js index 044473ec6313f0b25f09e6801c19bf98886b5359..0bbc85bec395f0fb955c3f9da8ba56dba4676edd 100644 --- a/js/src/api/pubsub/eth/eth.js +++ b/js-old/src/api/pubsub/eth/eth.js @@ -25,7 +25,7 @@ export default class Eth extends PubsubBase { } newHeads (callback) { - return this.addListener('eth', 'newHeads', callback, null); + return this.addListener('eth', 'newHeads', callback); } logs (callback) { diff --git a/js/src/api/pubsub/eth/index.js b/js-old/src/api/pubsub/eth/index.js similarity index 100% rename from js/src/api/pubsub/eth/index.js rename to js-old/src/api/pubsub/eth/index.js diff --git a/js/src/api/pubsub/index.js b/js-old/src/api/pubsub/index.js similarity index 100% rename from js/src/api/pubsub/index.js rename to js-old/src/api/pubsub/index.js diff --git a/js/src/api/pubsub/net/index.js b/js-old/src/api/pubsub/net/index.js similarity index 100% rename from js/src/api/pubsub/net/index.js rename to js-old/src/api/pubsub/net/index.js diff --git a/js/src/api/pubsub/net/net.js b/js-old/src/api/pubsub/net/net.js similarity index 100% rename from js/src/api/pubsub/net/net.js rename to js-old/src/api/pubsub/net/net.js diff --git a/js/src/api/pubsub/parity/index.js b/js-old/src/api/pubsub/parity/index.js similarity index 100% rename from js/src/api/pubsub/parity/index.js rename to js-old/src/api/pubsub/parity/index.js diff --git a/js/src/api/pubsub/parity/parity.js b/js-old/src/api/pubsub/parity/parity.js similarity index 89% rename from js/src/api/pubsub/parity/parity.js rename to js-old/src/api/pubsub/parity/parity.js index 042d8dc8b489ae8f503e68a6b01e2f703a915fb1..6df4a9204769d274b551d987c4957f38bbeefcb0 100644 --- a/js/src/api/pubsub/parity/parity.js +++ b/js-old/src/api/pubsub/parity/parity.js @@ -267,7 +267,7 @@ export default class Parity extends PubsubBase { // parity accounts API (only secure API or configured to be exposed) allAccountsInfo (callback) { - return this.addListener(this._api, 'parity_allAccountsInfo', (error, data) => { + return this._addListener(this._api, 'parity_allAccountsInfo', (error, data) => { error ? callback(error) : callback(null, outAccountInfo(data)); @@ -275,7 +275,7 @@ export default class Parity extends PubsubBase { } getDappAddresses (callback, dappId) { - return this.addListener(this._api, 'parity_getDappAddresses', (error, data) => { + return this._addListener(this._api, 'parity_getDappAddresses', (error, data) => { error ? callback(error) : callback(null, outAddresses(data)); @@ -283,7 +283,7 @@ export default class Parity extends PubsubBase { } getDappDefaultAddress (callback, dappId) { - return this.addListener(this._api, 'parity_getDappDefaultAddress', (error, data) => { + return this._addListener(this._api, 'parity_getDappDefaultAddress', (error, data) => { error ? callback(error) : callback(null, outAddress(data)); @@ -291,7 +291,7 @@ export default class Parity extends PubsubBase { } getNewDappsAddresses (callback) { - return this.addListener(this._api, 'parity_getDappDefaultAddress', (error, addresses) => { + return this._addListener(this._api, 'parity_getDappDefaultAddress', (error, addresses) => { error ? callback(error) : callback(null, addresses ? addresses.map(outAddress) : null); @@ -299,7 +299,7 @@ export default class Parity extends PubsubBase { } getNewDappsDefaultAddress (callback) { - return this.addListener(this._api, 'parity_getNewDappsDefaultAddress', (error, data) => { + return this._addListener(this._api, 'parity_getNewDappsDefaultAddress', (error, data) => { error ? callback(error) : callback(null, outAddress(data)); @@ -307,7 +307,7 @@ export default class Parity extends PubsubBase { } listRecentDapps (callback) { - return this.addListener(this._api, 'parity_listRecentDapps', (error, data) => { + return this._addListener(this._api, 'parity_listRecentDapps', (error, data) => { error ? callback(error) : callback(null, outRecentDapps(data)); @@ -315,7 +315,7 @@ export default class Parity extends PubsubBase { } listGethAccounts (callback) { - return this.addListener(this._api, 'parity_listGethAccounts', (error, data) => { + return this._addListener(this._api, 'parity_listGethAccounts', (error, data) => { error ? callback(error) : callback(null, outAddresses(data)); @@ -323,15 +323,15 @@ export default class Parity extends PubsubBase { } listVaults (callback) { - return this.addListener(this._api, 'parity_listVaults', callback); + return this._addListener(this._api, 'parity_listVaults', callback); } listOpenedVaults (callback) { - return this.addListener(this._api, 'parity_listOpenedVaults', callback); + return this._addListener(this._api, 'parity_listOpenedVaults', callback); } getVaultMeta (callback, vaultName) { - return this.addListener(this._api, 'parity_getVaultMeta', (error, data) => { + return this._addListener(this._api, 'parity_getVaultMeta', (error, data) => { error ? callback(error) : callback(null, outVaultMeta(data)); @@ -339,7 +339,7 @@ export default class Parity extends PubsubBase { } 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 ? callback(error) : callback(null, outAddress(data)); @@ -347,18 +347,10 @@ export default class Parity extends PubsubBase { } 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 ? callback(error) : callback(null, outAddress(data)); }, [inAddress(address), password, inDeriveIndex(index), !!shouldSave]); } - - nodeHealth (callback) { - return this.addListener(this._api, 'parity_nodeHealth', (error, data) => { - error - ? callback(error) - : callback(null, data); - }); - } } diff --git a/js/src/api/pubsub/pubsub.js b/js-old/src/api/pubsub/pubsub.js similarity index 69% rename from js/src/api/pubsub/pubsub.js rename to js-old/src/api/pubsub/pubsub.js index 4420967ee7590fb3ec333007e1761b39b9313620..edbc201ae5c3ca1e766349b449a4256dcba1d2d7 100644 --- a/js/src/api/pubsub/pubsub.js +++ b/js-old/src/api/pubsub/pubsub.js @@ -16,7 +16,6 @@ import Eth from './eth'; import Parity from './parity'; -import Signer from './signer'; import Net from './net'; import { isFunction } from '../util/types'; @@ -30,7 +29,6 @@ export default class Pubsub { this._eth = new Eth(transport); this._net = new Net(transport); this._parity = new Parity(transport); - this._signer = new Signer(transport); } get net () { @@ -45,35 +43,8 @@ export default class Pubsub { return this._parity; } - get signer () { - return this._signer; - } - unsubscribe (subscriptionIds) { // subscriptions are namespace independent. Thus we can simply removeListener from any. 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); - } - }); - } } diff --git a/js/src/api/pubsub/pubsub.spec.js b/js-old/src/api/pubsub/pubsub.spec.js similarity index 100% rename from js/src/api/pubsub/pubsub.spec.js rename to js-old/src/api/pubsub/pubsub.spec.js diff --git a/js/src/api/pubsub/pubsubBase.js b/js-old/src/api/pubsub/pubsubBase.js similarity index 72% rename from js/src/api/pubsub/pubsubBase.js rename to js-old/src/api/pubsub/pubsubBase.js index c50f45775a43b87e6518f5d106387b39894306c9..fcc7525d5b8d5451c797319bc823b1671ff6cd5f 100644 --- a/js/src/api/pubsub/pubsubBase.js +++ b/js-old/src/api/pubsub/pubsubBase.js @@ -20,12 +20,11 @@ export default class PubsubBase { this._transport = transport; } - addListener (module, eventName, callback, eventParams = []) { - if (eventName) { - return this._transport.subscribe(module, callback, eventParams ? [eventName, eventParams] : [eventName]); - } - - return this._transport.subscribe(module, callback, eventParams); + addListener (module, eventName, callback, eventParams) { + return eventParams + ? this._transport.subscribe(module, callback, eventName, eventParams) + : 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 } removeListener (subscriptionIds) { diff --git a/js/src/api/rpc/db/db.js b/js-old/src/api/rpc/db/db.js similarity index 100% rename from js/src/api/rpc/db/db.js rename to js-old/src/api/rpc/db/db.js diff --git a/js/src/api/rpc/db/db.spec.js b/js-old/src/api/rpc/db/db.spec.js similarity index 100% rename from js/src/api/rpc/db/db.spec.js rename to js-old/src/api/rpc/db/db.spec.js diff --git a/js/src/api/rpc/db/index.js b/js-old/src/api/rpc/db/index.js similarity index 100% rename from js/src/api/rpc/db/index.js rename to js-old/src/api/rpc/db/index.js diff --git a/js/src/api/rpc/eth/eth.e2e.js b/js-old/src/api/rpc/eth/eth.e2e.js similarity index 100% rename from js/src/api/rpc/eth/eth.e2e.js rename to js-old/src/api/rpc/eth/eth.e2e.js diff --git a/js/src/api/rpc/eth/eth.js b/js-old/src/api/rpc/eth/eth.js similarity index 100% rename from js/src/api/rpc/eth/eth.js rename to js-old/src/api/rpc/eth/eth.js diff --git a/js/src/api/rpc/eth/eth.spec.js b/js-old/src/api/rpc/eth/eth.spec.js similarity index 100% rename from js/src/api/rpc/eth/eth.spec.js rename to js-old/src/api/rpc/eth/eth.spec.js diff --git a/js/src/api/rpc/eth/index.js b/js-old/src/api/rpc/eth/index.js similarity index 100% rename from js/src/api/rpc/eth/index.js rename to js-old/src/api/rpc/eth/index.js diff --git a/js/src/api/rpc/index.js b/js-old/src/api/rpc/index.js similarity index 100% rename from js/src/api/rpc/index.js rename to js-old/src/api/rpc/index.js diff --git a/js/src/api/rpc/net/index.js b/js-old/src/api/rpc/net/index.js similarity index 100% rename from js/src/api/rpc/net/index.js rename to js-old/src/api/rpc/net/index.js diff --git a/js/src/api/rpc/net/net.e2e.js b/js-old/src/api/rpc/net/net.e2e.js similarity index 100% rename from js/src/api/rpc/net/net.e2e.js rename to js-old/src/api/rpc/net/net.e2e.js diff --git a/js/src/api/rpc/net/net.js b/js-old/src/api/rpc/net/net.js similarity index 100% rename from js/src/api/rpc/net/net.js rename to js-old/src/api/rpc/net/net.js diff --git a/js/src/api/rpc/net/net.spec.js b/js-old/src/api/rpc/net/net.spec.js similarity index 100% rename from js/src/api/rpc/net/net.spec.js rename to js-old/src/api/rpc/net/net.spec.js diff --git a/js/src/api/rpc/parity/index.js b/js-old/src/api/rpc/parity/index.js similarity index 100% rename from js/src/api/rpc/parity/index.js rename to js-old/src/api/rpc/parity/index.js diff --git a/js/src/api/rpc/parity/parity.e2e.js b/js-old/src/api/rpc/parity/parity.e2e.js similarity index 100% rename from js/src/api/rpc/parity/parity.e2e.js rename to js-old/src/api/rpc/parity/parity.e2e.js diff --git a/js/src/api/rpc/parity/parity.js b/js-old/src/api/rpc/parity/parity.js similarity index 96% rename from js/src/api/rpc/parity/parity.js rename to js-old/src/api/rpc/parity/parity.js index d49e75a78d472b1aa88d784e778e5a2a27bf21c6..59ccb58845a68696bfcd8efaf5a860539eba590e 100644 --- a/js/src/api/rpc/parity/parity.js +++ b/js-old/src/api/rpc/parity/parity.js @@ -44,20 +44,6 @@ export default class Parity { .execute('parity_addReservedPeer', enode); } - call (requests, blockNumber = 'latest') { - return this._transport - .execute( - 'parity_call', - requests.map((options) => inOptions(options)), - inBlockNumber(blockNumber) - ); - } - - chainId () { - return this._transport - .execute('parity_chainId'); - } - chainStatus () { return this._transport .execute('parity_chainStatus') @@ -257,16 +243,6 @@ export default class Parity { .then(outHwAccountInfo); } - lockedHardwareAccountsInfo () { - return this._transport - .execute('parity_lockedHardwareAccountsInfo'); - } - - hardwarePinMatrixAck (path, pin) { - return this._transport - .execute('parity_hardwarePinMatrixAck', path, pin); - } - hashContent (url) { return this._transport .execute('parity_hashContent', url); diff --git a/js/src/api/rpc/parity/parity.spec.js b/js-old/src/api/rpc/parity/parity.spec.js similarity index 100% rename from js/src/api/rpc/parity/parity.spec.js rename to js-old/src/api/rpc/parity/parity.spec.js diff --git a/js/src/api/rpc/personal/index.js b/js-old/src/api/rpc/personal/index.js similarity index 100% rename from js/src/api/rpc/personal/index.js rename to js-old/src/api/rpc/personal/index.js diff --git a/js/src/api/rpc/personal/personal.e2e.js b/js-old/src/api/rpc/personal/personal.e2e.js similarity index 100% rename from js/src/api/rpc/personal/personal.e2e.js rename to js-old/src/api/rpc/personal/personal.e2e.js diff --git a/js/src/api/rpc/personal/personal.js b/js-old/src/api/rpc/personal/personal.js similarity index 100% rename from js/src/api/rpc/personal/personal.js rename to js-old/src/api/rpc/personal/personal.js diff --git a/js/src/api/rpc/personal/personal.spec.js b/js-old/src/api/rpc/personal/personal.spec.js similarity index 100% rename from js/src/api/rpc/personal/personal.spec.js rename to js-old/src/api/rpc/personal/personal.spec.js diff --git a/js/src/api/rpc/shh/index.js b/js-old/src/api/rpc/shh/index.js similarity index 100% rename from js/src/api/rpc/shh/index.js rename to js-old/src/api/rpc/shh/index.js diff --git a/js/src/api/rpc/shh/shh.js b/js-old/src/api/rpc/shh/shh.js similarity index 100% rename from js/src/api/rpc/shh/shh.js rename to js-old/src/api/rpc/shh/shh.js diff --git a/js/src/api/rpc/signer/index.js b/js-old/src/api/rpc/signer/index.js similarity index 100% rename from js/src/api/rpc/signer/index.js rename to js-old/src/api/rpc/signer/index.js diff --git a/js/src/api/rpc/signer/signer.js b/js-old/src/api/rpc/signer/signer.js similarity index 100% rename from js/src/api/rpc/signer/signer.js rename to js-old/src/api/rpc/signer/signer.js diff --git a/js/src/api/rpc/trace/index.js b/js-old/src/api/rpc/trace/index.js similarity index 100% rename from js/src/api/rpc/trace/index.js rename to js-old/src/api/rpc/trace/index.js diff --git a/js/src/api/rpc/trace/trace.e2e.js b/js-old/src/api/rpc/trace/trace.e2e.js similarity index 100% rename from js/src/api/rpc/trace/trace.e2e.js rename to js-old/src/api/rpc/trace/trace.e2e.js diff --git a/js/src/api/rpc/trace/trace.js b/js-old/src/api/rpc/trace/trace.js similarity index 100% rename from js/src/api/rpc/trace/trace.js rename to js-old/src/api/rpc/trace/trace.js diff --git a/js/src/api/rpc/trace/trace.spec.js b/js-old/src/api/rpc/trace/trace.spec.js similarity index 100% rename from js/src/api/rpc/trace/trace.spec.js rename to js-old/src/api/rpc/trace/trace.spec.js diff --git a/js/src/api/rpc/web3/index.js b/js-old/src/api/rpc/web3/index.js similarity index 100% rename from js/src/api/rpc/web3/index.js rename to js-old/src/api/rpc/web3/index.js diff --git a/js/src/api/rpc/web3/web3.e2e.js b/js-old/src/api/rpc/web3/web3.e2e.js similarity index 100% rename from js/src/api/rpc/web3/web3.e2e.js rename to js-old/src/api/rpc/web3/web3.e2e.js diff --git a/js/src/api/rpc/web3/web3.js b/js-old/src/api/rpc/web3/web3.js similarity index 100% rename from js/src/api/rpc/web3/web3.js rename to js-old/src/api/rpc/web3/web3.js diff --git a/js/src/api/rpc/web3/web3.spec.js b/js-old/src/api/rpc/web3/web3.spec.js similarity index 100% rename from js/src/api/rpc/web3/web3.spec.js rename to js-old/src/api/rpc/web3/web3.spec.js diff --git a/js/src/api/subscriptions/eth.js b/js-old/src/api/subscriptions/eth.js similarity index 51% rename from js/src/api/subscriptions/eth.js rename to js-old/src/api/subscriptions/eth.js index bbab9567248f6aac608152ae5f2afc96cbb8eff8..8e56f335f7e527a90107efb0efff6ba0a26440ec 100644 --- a/js/src/api/subscriptions/eth.js +++ b/js-old/src/api/subscriptions/eth.js @@ -24,13 +24,6 @@ export default class Eth { this._lastBlock = new BigNumber(-1); this._pollTimerId = null; - - // Try to restart subscription if transport is closed - this._api.transport.on('close', () => { - if (this.isStarted) { - this.start(); - } - }); } get isStarted () { @@ -40,56 +33,31 @@ export default class Eth { start () { this._started = true; - 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); + return this._blockNumber(); } - _pollBlockNumber = (doTimeout) => { - const nextTimeout = (timeout = 1000, forceTimeout = doTimeout) => { - if (forceTimeout) { - this._pollTimerId = setTimeout(() => { - this._pollBlockNumber(doTimeout); - }, timeout); - } + _blockNumber = () => { + const nextTimeout = (timeout = 1000) => { + this._pollTimerId = setTimeout(() => { + this._blockNumber(); + }, timeout); }; if (!this._api.transport.isConnected) { - nextTimeout(500, true); + nextTimeout(500); return; } return this._api.eth .blockNumber() .then((blockNumber) => { - this.updateBlock(blockNumber); + if (!blockNumber.eq(this._lastBlock)) { + this._lastBlock = blockNumber; + this._updateSubscriptions('eth_blockNumber', null, blockNumber); + } nextTimeout(); }) .catch(() => nextTimeout()); } - - updateBlock (blockNumber) { - if (!blockNumber.eq(this._lastBlock)) { - this._lastBlock = blockNumber; - this._updateSubscriptions('eth_blockNumber', null, blockNumber); - } - } } diff --git a/js/src/api/subscriptions/eth.spec.js b/js-old/src/api/subscriptions/eth.spec.js similarity index 98% rename from js/src/api/subscriptions/eth.spec.js rename to js-old/src/api/subscriptions/eth.spec.js index 2893a14dcdc1e3f7573daf5b90feec0ab6deccf3..3f5ee81d66f8a4c51ea67adbf94fd405cf792998 100644 --- a/js/src/api/subscriptions/eth.spec.js +++ b/js-old/src/api/subscriptions/eth.spec.js @@ -29,8 +29,7 @@ function stubApi (blockNumber) { return { _calls, transport: { - isConnected: true, - on: () => {} + isConnected: true }, eth: { blockNumber: () => { diff --git a/js/src/api/subscriptions/index.js b/js-old/src/api/subscriptions/index.js similarity index 100% rename from js/src/api/subscriptions/index.js rename to js-old/src/api/subscriptions/index.js diff --git a/js/src/api/subscriptions/logging.js b/js-old/src/api/subscriptions/logging.js similarity index 100% rename from js/src/api/subscriptions/logging.js rename to js-old/src/api/subscriptions/logging.js diff --git a/js/src/api/subscriptions/logging.spec.js b/js-old/src/api/subscriptions/logging.spec.js similarity index 100% rename from js/src/api/subscriptions/logging.spec.js rename to js-old/src/api/subscriptions/logging.spec.js diff --git a/js/src/api/subscriptions/manager.js b/js-old/src/api/subscriptions/manager.js similarity index 100% rename from js/src/api/subscriptions/manager.js rename to js-old/src/api/subscriptions/manager.js diff --git a/js/src/api/subscriptions/manager.spec.js b/js-old/src/api/subscriptions/manager.spec.js similarity index 98% rename from js/src/api/subscriptions/manager.spec.js rename to js-old/src/api/subscriptions/manager.spec.js index 05d645e6bd326c8b10cf9ad16bb4961d64b65fbb..df708a36dcbb933f23c20185c07ccae3dabb3874 100644 --- a/js/src/api/subscriptions/manager.spec.js +++ b/js-old/src/api/subscriptions/manager.spec.js @@ -23,8 +23,7 @@ function newStub () { const manager = new Manager({ transport: { - isConnected: true, - on: sinon.stub() + isConnected: true } }); diff --git a/js/src/api/subscriptions/personal.js b/js-old/src/api/subscriptions/personal.js similarity index 79% rename from js/src/api/subscriptions/personal.js rename to js-old/src/api/subscriptions/personal.js index 8b2b826d0e38100faa5798dda14b5c9fb57c95d2..fa7ae823ca99a1283a155e778c3453dcb7ebbc01 100644 --- a/js/src/api/subscriptions/personal.js +++ b/js-old/src/api/subscriptions/personal.js @@ -23,13 +23,6 @@ export default class Personal { this._lastDefaultAccount = '0x0'; this._pollTimerId = null; - - // Try to restart subscription if transport is closed - this._api.transport.on('close', () => { - if (this.isStarted) { - this.start(); - } - }); } get isStarted () { @@ -39,42 +32,20 @@ export default class Personal { start () { 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([ - defaultAccount, + this._defaultAccount(), this._listAccounts(), this._accountsInfo(), 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 // 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 // to pub-sub as it becomes available _defaultAccount = (timerDisabled = false) => { - const nextTimeout = (timeout = 3000) => { + const nextTimeout = (timeout = 1000) => { if (!timerDisabled) { this._pollTimerId = setTimeout(() => { this._defaultAccount(); @@ -90,7 +61,11 @@ export default class Personal { return this._api.parity .defaultAccount() .then((defaultAccount) => { - this.updateDefaultAccount(defaultAccount); + if (this._lastDefaultAccount !== defaultAccount) { + this._lastDefaultAccount = defaultAccount; + this._updateSubscriptions('parity_defaultAccount', null, defaultAccount); + } + nextTimeout(); }) .catch(() => nextTimeout()); diff --git a/js/src/api/subscriptions/personal.spec.js b/js-old/src/api/subscriptions/personal.spec.js similarity index 98% rename from js/src/api/subscriptions/personal.spec.js rename to js-old/src/api/subscriptions/personal.spec.js index 3e950579c5f92889124e39c488381679cf786d8f..ac046d25099dc78af3c4e2b54b191d008e58ab64 100644 --- a/js/src/api/subscriptions/personal.spec.js +++ b/js-old/src/api/subscriptions/personal.spec.js @@ -37,8 +37,7 @@ function stubApi (accounts, info) { return { _calls, transport: { - isConnected: true, - on: sinon.stub() + isConnected: true }, parity: { accountsInfo: () => { diff --git a/js/src/api/subscriptions/signer.js b/js-old/src/api/subscriptions/signer.js similarity index 64% rename from js/src/api/subscriptions/signer.js rename to js-old/src/api/subscriptions/signer.js index 30342cfa73c66e16aa0deecf27d80a0a9f18baab..2215ed7f3df6e312df49446d85ec67879fdea163 100644 --- a/js/src/api/subscriptions/signer.js +++ b/js-old/src/api/subscriptions/signer.js @@ -22,13 +22,6 @@ export default class Signer { this._api = api; this._updateSubscriptions = updateSubscriptions; this._started = false; - - // Try to restart subscription if transport is closed - this._api.transport.on('close', () => { - if (this.isStarted) { - this.start(); - } - }); } get isStarted () { @@ -38,56 +31,30 @@ export default class Signer { start () { this._started = true; - return this - ._api - .transport - .ready - .then(() => { - 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([ - this._listRequests(true), - this._loggingSubscribe() - ]); - }); - } - - updateSubscriptions (requests) { - return this._updateSubscriptions('signer_requestsToConfirm', null, requests); + return Promise.all([ + this._listRequests(true), + this._loggingSubscribe() + ]); } _listRequests = (doTimeout) => { - const nextTimeout = (timeout = 1000, forceTimeout = doTimeout) => { - if (forceTimeout) { + const nextTimeout = (timeout = 1000) => { + if (doTimeout) { setTimeout(() => { - this._listRequests(doTimeout); + this._listRequests(true); }, timeout); } }; if (!this._api.transport.isConnected) { - nextTimeout(500, true); + nextTimeout(500); return; } return this._api.signer .requestsToConfirm() .then((requests) => { - this.updateSubscriptions(requests); + this._updateSubscriptions('signer_requestsToConfirm', null, requests); nextTimeout(); }) .catch(() => nextTimeout()); diff --git a/js/src/api/transport/error.js b/js-old/src/api/transport/error.js similarity index 100% rename from js/src/api/transport/error.js rename to js-old/src/api/transport/error.js diff --git a/js/src/api/transport/http/http.e2e.js b/js-old/src/api/transport/http/http.e2e.js similarity index 100% rename from js/src/api/transport/http/http.e2e.js rename to js-old/src/api/transport/http/http.e2e.js diff --git a/js/src/api/transport/http/http.js b/js-old/src/api/transport/http/http.js similarity index 100% rename from js/src/api/transport/http/http.js rename to js-old/src/api/transport/http/http.js diff --git a/js/src/api/transport/http/http.spec.js b/js-old/src/api/transport/http/http.spec.js similarity index 100% rename from js/src/api/transport/http/http.spec.js rename to js-old/src/api/transport/http/http.spec.js diff --git a/js/src/api/transport/http/index.js b/js-old/src/api/transport/http/index.js similarity index 100% rename from js/src/api/transport/http/index.js rename to js-old/src/api/transport/http/index.js diff --git a/js/src/api/transport/index.js b/js-old/src/api/transport/index.js similarity index 100% rename from js/src/api/transport/index.js rename to js-old/src/api/transport/index.js diff --git a/js/src/api/transport/jsonRpcBase.js b/js-old/src/api/transport/jsonRpcBase.js similarity index 84% rename from js/src/api/transport/jsonRpcBase.js rename to js-old/src/api/transport/jsonRpcBase.js index 9e5e18bfecb4dc66a77a01947da2735b094599b9..819e1f496ff723aea7c2b995c83052d25d0f10a9 100644 --- a/js/src/api/transport/jsonRpcBase.js +++ b/js-old/src/api/transport/jsonRpcBase.js @@ -15,11 +15,7 @@ // along with Parity. If not, see . import EventEmitter from 'eventemitter3'; - import { Logging } from '../subscriptions'; -import logger from './logger'; - -const LOGGER_ENABLED = process.env.NODE_ENV !== 'production'; export default class JsonRpcBase extends EventEmitter { constructor () { @@ -31,10 +27,6 @@ export default class JsonRpcBase extends EventEmitter { this._middlewareList = Promise.resolve([]); } - get ready () { - return this._middlewareList.then(() => true); - } - encode (method, params) { const json = JSON.stringify({ jsonrpc: '2.0', @@ -83,14 +75,6 @@ export default class JsonRpcBase extends EventEmitter { } execute (method, ...params) { - let start; - let logId; - - if (LOGGER_ENABLED) { - start = Date.now(); - logId = logger.log({ method, params }); - } - return this._middlewareList.then((middlewareList) => { for (const middleware of middlewareList) { const res = middleware.handle(method, params); @@ -109,18 +93,7 @@ export default class JsonRpcBase extends EventEmitter { } } - 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; - }); + return this._execute(method, params); }); } diff --git a/js/src/api/transport/jsonRpcBase.spec.js b/js-old/src/api/transport/jsonRpcBase.spec.js similarity index 100% rename from js/src/api/transport/jsonRpcBase.spec.js rename to js-old/src/api/transport/jsonRpcBase.spec.js diff --git a/js/src/api/transport/middleware.js b/js-old/src/api/transport/middleware.js similarity index 63% rename from js/src/api/transport/middleware.js rename to js-old/src/api/transport/middleware.js index ccdf732a0f3b154df0ea1defef617840cb93fb1e..ef029b1cbc8db9b3ca94c2cd4915e77ec2426a67 100644 --- a/js/src/api/transport/middleware.js +++ b/js-old/src/api/transport/middleware.js @@ -17,20 +17,7 @@ export default class Middleware { constructor (transport) { this._transport = transport; - this._subscribe = transport.subscribe; - - transport.subscribe = this.handleSubscribe.bind(this); - this._handlers = {}; - this._subHandlers = {}; - } - - registerSubscribe (method, handler) { - if (method in this._subHandlers) { - throw new Error(`${method} is already defined in the middleware!`); - } - - this._subHandlers[method] = handler; } register (method, handler) { @@ -41,24 +28,10 @@ export default class Middleware { this._handlers[method] = handler; } - handleSubscribe (api, callback, event) { - // Don't ask - const method = api.subscribe ? api.subscribe : event[0]; - const params = event.length === 2 ? event[1] : event; - - const handler = this._subHandlers[method]; - - if (handler) { - return handler(params, callback); - } - - this._subscribe.call(this._transport, api, callback, event); - } - handle (method, params) { const handler = this._handlers[method]; - if (handler) { + if (handler != null) { return handler(params); } diff --git a/js/src/api/transport/middleware.spec.js b/js-old/src/api/transport/middleware.spec.js similarity index 100% rename from js/src/api/transport/middleware.spec.js rename to js-old/src/api/transport/middleware.spec.js diff --git a/js/src/api/transport/ws/index.js b/js-old/src/api/transport/ws/index.js similarity index 100% rename from js/src/api/transport/ws/index.js rename to js-old/src/api/transport/ws/index.js diff --git a/js/src/api/transport/ws/ws.e2e.js b/js-old/src/api/transport/ws/ws.e2e.js similarity index 100% rename from js/src/api/transport/ws/ws.e2e.js rename to js-old/src/api/transport/ws/ws.e2e.js diff --git a/js/src/api/transport/ws/ws.js b/js-old/src/api/transport/ws/ws.js similarity index 96% rename from js/src/api/transport/ws/ws.js rename to js-old/src/api/transport/ws/ws.js index 63abecb839d9d386426cd6ba8c9b0302546d4889..9c276772dc366cd297110a0f62c9ba0f33b84005 100644 --- a/js/src/api/transport/ws/ws.js +++ b/js-old/src/api/transport/ws/ws.js @@ -29,7 +29,7 @@ export default class Ws extends JsonRpcBase { this._url = url; this._token = token; this._messages = {}; - this._subscriptions = {}; + this._subscriptions = { 'eth_subscription': [], 'parity_subscription': [], 'shh_subscription': [] }; this._sessionHash = null; this._connecting = false; @@ -209,7 +209,6 @@ export default class Ws extends JsonRpcBase { // initial pubsub ACK if (id && msg.subscription) { // save subscription to map subId -> messageId - this._subscriptions[msg.subscription] = this._subscriptions[msg.subscription] || {}; this._subscriptions[msg.subscription][res] = id; // resolve promise with messageId because subId's can collide (eth/parity) msg.resolve(id); @@ -224,7 +223,7 @@ export default class Ws extends JsonRpcBase { } // pubsub format - if (this._subscriptions[method]) { + if (method.includes('subscription')) { const messageId = this._messages[this._subscriptions[method][params.subscription]]; if (messageId) { @@ -303,16 +302,6 @@ export default class Ws extends JsonRpcBase { } _methodsFromApi (api) { - if (api.subscription) { - const { subscribe, unsubscribe, subscription } = api; - - return { - method: subscribe, - uMethod: unsubscribe, - subscription - }; - } - const method = `${api}_subscribe`; const uMethod = `${api}_unsubscribe`; const subscription = `${api}_subscription`; @@ -320,7 +309,7 @@ export default class Ws extends JsonRpcBase { return { method, uMethod, subscription }; } - subscribe (api, callback, params) { + subscribe (api, callback, ...params) { return new Promise((resolve, reject) => { const id = this.id; const { method, uMethod, subscription } = this._methodsFromApi(api); diff --git a/js/src/api/transport/ws/ws.spec.js b/js-old/src/api/transport/ws/ws.spec.js similarity index 100% rename from js/src/api/transport/ws/ws.spec.js rename to js-old/src/api/transport/ws/ws.spec.js diff --git a/js/src/api/util/decode.js b/js-old/src/api/util/decode.js similarity index 100% rename from js/src/api/util/decode.js rename to js-old/src/api/util/decode.js diff --git a/js/src/api/util/decode.spec.js b/js-old/src/api/util/decode.spec.js similarity index 100% rename from js/src/api/util/decode.spec.js rename to js-old/src/api/util/decode.spec.js diff --git a/js/src/api/util/encode.js b/js-old/src/api/util/encode.js similarity index 100% rename from js/src/api/util/encode.js rename to js-old/src/api/util/encode.js diff --git a/js/src/api/util/encode.spec.js b/js-old/src/api/util/encode.spec.js similarity index 100% rename from js/src/api/util/encode.spec.js rename to js-old/src/api/util/encode.spec.js diff --git a/js/src/api/util/format.js b/js-old/src/api/util/format.js similarity index 94% rename from js/src/api/util/format.js rename to js-old/src/api/util/format.js index e981fb06ded4193db5e20f3b38ede5216044b04a..6a4a81d4004dee944817fde894c2eaeb9169269f 100644 --- a/js/src/api/util/format.js +++ b/js-old/src/api/util/format.js @@ -75,13 +75,10 @@ export function bytesToAscii (bytes) { } export function asciiToHex (string) { - let result = '0x'; - - for (let i = 0; i < string.length; ++i) { - result += ('0' + string.charCodeAt(i).toString(16)).substr(-2); - } - - return result; + return '0x' + string.split('') + .map(s => s.charCodeAt(0)) + .map(s => s < 0x10 ? '0' + s.toString(16) : s.toString(16)) + .join(''); } export function padRight (input, length) { diff --git a/js/src/api/util/format.spec.js b/js-old/src/api/util/format.spec.js similarity index 91% rename from js/src/api/util/format.spec.js rename to js-old/src/api/util/format.spec.js index 4058f5364c93e343496563a51763cd2dc2c68453..ba7a3994e049b7762626df5dbca12c599de8bc8c 100644 --- a/js/src/api/util/format.spec.js +++ b/js-old/src/api/util/format.spec.js @@ -69,14 +69,6 @@ describe('api/util/format', () => { expect(asciiToHex('abc')).to.equal('0x616263'); expect(asciiToHex('a\nb')).to.equal('0x610a62'); }); - - it('correctly converts where charCode < 0x10', () => { - expect( - asciiToHex( - [32, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0].map((v) => String.fromCharCode(v)).join('') - ) - ).to.equal('0x20100f0e0d0c0b0a09080706050403020100'); - }); }); describe('hexToAscii', () => { diff --git a/js/src/api/util/identity.js b/js-old/src/api/util/identity.js similarity index 100% rename from js/src/api/util/identity.js rename to js-old/src/api/util/identity.js diff --git a/js/src/api/util/index.js b/js-old/src/api/util/index.js similarity index 100% rename from js/src/api/util/index.js rename to js-old/src/api/util/index.js diff --git a/js/src/api/util/sha3.js b/js-old/src/api/util/sha3.js similarity index 100% rename from js/src/api/util/sha3.js rename to js-old/src/api/util/sha3.js diff --git a/js/src/api/util/sha3.spec.js b/js-old/src/api/util/sha3.spec.js similarity index 100% rename from js/src/api/util/sha3.spec.js rename to js-old/src/api/util/sha3.spec.js diff --git a/js/src/api/util/types.js b/js-old/src/api/util/types.js similarity index 100% rename from js/src/api/util/types.js rename to js-old/src/api/util/types.js diff --git a/js/src/api/util/types.spec.js b/js-old/src/api/util/types.spec.js similarity index 100% rename from js/src/api/util/types.spec.js rename to js-old/src/api/util/types.spec.js diff --git a/js/src/api/util/wei.js b/js-old/src/api/util/wei.js similarity index 100% rename from js/src/api/util/wei.js rename to js-old/src/api/util/wei.js diff --git a/js/src/api/util/wei.spec.js b/js-old/src/api/util/wei.spec.js similarity index 100% rename from js/src/api/util/wei.spec.js rename to js-old/src/api/util/wei.spec.js diff --git a/js/src/config.js b/js-old/src/config.js similarity index 100% rename from js/src/config.js rename to js-old/src/config.js diff --git a/js/src/contracts/abi/badgereg.json b/js-old/src/contracts/abi/badgereg.json similarity index 100% rename from js/src/contracts/abi/badgereg.json rename to js-old/src/contracts/abi/badgereg.json diff --git a/js/src/contracts/abi/basiccoin.json b/js-old/src/contracts/abi/basiccoin.json similarity index 100% rename from js/src/contracts/abi/basiccoin.json rename to js-old/src/contracts/abi/basiccoin.json diff --git a/js/src/contracts/abi/basiccoinmanager.json b/js-old/src/contracts/abi/basiccoinmanager.json similarity index 100% rename from js/src/contracts/abi/basiccoinmanager.json rename to js-old/src/contracts/abi/basiccoinmanager.json diff --git a/js/src/contracts/abi/certifier.json b/js-old/src/contracts/abi/certifier.json similarity index 100% rename from js/src/contracts/abi/certifier.json rename to js-old/src/contracts/abi/certifier.json diff --git a/js/src/contracts/abi/consensys-multisig-wallet.json b/js-old/src/contracts/abi/consensys-multisig-wallet.json similarity index 100% rename from js/src/contracts/abi/consensys-multisig-wallet.json rename to js-old/src/contracts/abi/consensys-multisig-wallet.json diff --git a/js/src/contracts/abi/dappreg.json b/js-old/src/contracts/abi/dappreg.json similarity index 100% rename from js/src/contracts/abi/dappreg.json rename to js-old/src/contracts/abi/dappreg.json diff --git a/js/src/contracts/abi/eip20.json b/js-old/src/contracts/abi/eip20.json similarity index 100% rename from js/src/contracts/abi/eip20.json rename to js-old/src/contracts/abi/eip20.json diff --git a/js/src/contracts/abi/email-verification.json b/js-old/src/contracts/abi/email-verification.json similarity index 100% rename from js/src/contracts/abi/email-verification.json rename to js-old/src/contracts/abi/email-verification.json diff --git a/js/src/contracts/abi/foundation-multisig-wallet.json b/js-old/src/contracts/abi/foundation-multisig-wallet.json similarity index 100% rename from js/src/contracts/abi/foundation-multisig-wallet.json rename to js-old/src/contracts/abi/foundation-multisig-wallet.json diff --git a/js/src/contracts/abi/gavcoin.json b/js-old/src/contracts/abi/gavcoin.json similarity index 100% rename from js/src/contracts/abi/gavcoin.json rename to js-old/src/contracts/abi/gavcoin.json diff --git a/js/src/contracts/abi/githubhint.json b/js-old/src/contracts/abi/githubhint.json similarity index 100% rename from js/src/contracts/abi/githubhint.json rename to js-old/src/contracts/abi/githubhint.json diff --git a/js/src/contracts/abi/index.js b/js-old/src/contracts/abi/index.js similarity index 97% rename from js/src/contracts/abi/index.js rename to js-old/src/contracts/abi/index.js index eac825820b9338d9748954816bf8833fc7c45f7f..f475cce070b8b813008721987ccaa19c3497be0e 100644 --- a/js/src/contracts/abi/index.js +++ b/js-old/src/contracts/abi/index.js @@ -29,4 +29,3 @@ export signaturereg from './signaturereg.json'; export smsverification from './sms-verification.json'; export tokenreg from './tokenreg.json'; export foundationWallet from './foundation-multisig-wallet.json'; -export vouchfor from './vouchfor.json'; diff --git a/js/src/contracts/abi/old-wallet.json b/js-old/src/contracts/abi/old-wallet.json similarity index 100% rename from js/src/contracts/abi/old-wallet.json rename to js-old/src/contracts/abi/old-wallet.json diff --git a/js/src/contracts/abi/owned.json b/js-old/src/contracts/abi/owned.json similarity index 100% rename from js/src/contracts/abi/owned.json rename to js-old/src/contracts/abi/owned.json diff --git a/js/src/contracts/abi/registry.json b/js-old/src/contracts/abi/registry.json similarity index 100% rename from js/src/contracts/abi/registry.json rename to js-old/src/contracts/abi/registry.json diff --git a/js/src/contracts/abi/registry2.json b/js-old/src/contracts/abi/registry2.json similarity index 100% rename from js/src/contracts/abi/registry2.json rename to js-old/src/contracts/abi/registry2.json diff --git a/js/src/contracts/abi/signaturereg.json b/js-old/src/contracts/abi/signaturereg.json similarity index 100% rename from js/src/contracts/abi/signaturereg.json rename to js-old/src/contracts/abi/signaturereg.json diff --git a/js/src/contracts/abi/sms-verification.json b/js-old/src/contracts/abi/sms-verification.json similarity index 100% rename from js/src/contracts/abi/sms-verification.json rename to js-old/src/contracts/abi/sms-verification.json diff --git a/js/src/contracts/abi/tokenreg.json b/js-old/src/contracts/abi/tokenreg.json similarity index 100% rename from js/src/contracts/abi/tokenreg.json rename to js-old/src/contracts/abi/tokenreg.json diff --git a/js/src/contracts/badgereg.js b/js-old/src/contracts/badgereg.js similarity index 98% rename from js/src/contracts/badgereg.js rename to js-old/src/contracts/badgereg.js index 07e740e6d1fab8c350a7af9b0ade40044f8807e9..a1782cb30174443013ffcad17f7b00f9c9dec50c 100644 --- a/js/src/contracts/badgereg.js +++ b/js-old/src/contracts/badgereg.js @@ -105,7 +105,7 @@ export default class BadgeReg { ]); }) .then(([ title, icon ]) => { - title = bytesToHex(title).replace(/(00)+$/, ''); + title = bytesToHex(title); title = title === ZERO32 ? null : hexToAscii(title); if (bytesToHex(icon) === ZERO32) { diff --git a/js/src/contracts/code/index.js b/js-old/src/contracts/code/index.js similarity index 100% rename from js/src/contracts/code/index.js rename to js-old/src/contracts/code/index.js diff --git a/js/src/contracts/code/wallet.js b/js-old/src/contracts/code/wallet.js similarity index 100% rename from js/src/contracts/code/wallet.js rename to js-old/src/contracts/code/wallet.js diff --git a/js/src/contracts/contracts.js b/js-old/src/contracts/contracts.js similarity index 100% rename from js/src/contracts/contracts.js rename to js-old/src/contracts/contracts.js diff --git a/js/src/contracts/dappreg.js b/js-old/src/contracts/dappreg.js similarity index 100% rename from js/src/contracts/dappreg.js rename to js-old/src/contracts/dappreg.js diff --git a/js/src/contracts/githubhint.js b/js-old/src/contracts/githubhint.js similarity index 100% rename from js/src/contracts/githubhint.js rename to js-old/src/contracts/githubhint.js diff --git a/js/src/contracts/githubhint.spec.js b/js-old/src/contracts/githubhint.spec.js similarity index 100% rename from js/src/contracts/githubhint.spec.js rename to js-old/src/contracts/githubhint.spec.js diff --git a/js/src/contracts/index.js b/js-old/src/contracts/index.js similarity index 100% rename from js/src/contracts/index.js rename to js-old/src/contracts/index.js diff --git a/js/src/contracts/registry.js b/js-old/src/contracts/registry.js similarity index 100% rename from js/src/contracts/registry.js rename to js-old/src/contracts/registry.js diff --git a/js/src/contracts/registry.spec.js b/js-old/src/contracts/registry.spec.js similarity index 100% rename from js/src/contracts/registry.spec.js rename to js-old/src/contracts/registry.spec.js diff --git a/js/src/contracts/signaturereg.js b/js-old/src/contracts/signaturereg.js similarity index 100% rename from js/src/contracts/signaturereg.js rename to js-old/src/contracts/signaturereg.js diff --git a/js/src/contracts/snippets/enhanced-wallet.sol b/js-old/src/contracts/snippets/enhanced-wallet.sol similarity index 100% rename from js/src/contracts/snippets/enhanced-wallet.sol rename to js-old/src/contracts/snippets/enhanced-wallet.sol diff --git a/js/src/contracts/snippets/human-standard-token.sol b/js-old/src/contracts/snippets/human-standard-token.sol similarity index 100% rename from js/src/contracts/snippets/human-standard-token.sol rename to js-old/src/contracts/snippets/human-standard-token.sol diff --git a/js/src/contracts/snippets/standard-token.sol b/js-old/src/contracts/snippets/standard-token.sol similarity index 100% rename from js/src/contracts/snippets/standard-token.sol rename to js-old/src/contracts/snippets/standard-token.sol diff --git a/js/src/contracts/snippets/token.sol b/js-old/src/contracts/snippets/token.sol similarity index 100% rename from js/src/contracts/snippets/token.sol rename to js-old/src/contracts/snippets/token.sol diff --git a/js/src/contracts/snippets/wallet.sol b/js-old/src/contracts/snippets/wallet.sol similarity index 100% rename from js/src/contracts/snippets/wallet.sol rename to js-old/src/contracts/snippets/wallet.sol diff --git a/js/src/contracts/tokenreg.js b/js-old/src/contracts/tokenreg.js similarity index 100% rename from js/src/contracts/tokenreg.js rename to js-old/src/contracts/tokenreg.js diff --git a/js/src/contracts/verification.js b/js-old/src/contracts/verification.js similarity index 100% rename from js/src/contracts/verification.js rename to js-old/src/contracts/verification.js diff --git a/js/src/dapps/chaindeploy.js b/js-old/src/dapps/chaindeploy.js similarity index 100% rename from js/src/dapps/chaindeploy.js rename to js-old/src/dapps/chaindeploy.js diff --git a/js/src/dapps/chaindeploy/Application/application.css b/js-old/src/dapps/chaindeploy/Application/application.css similarity index 100% rename from js/src/dapps/chaindeploy/Application/application.css rename to js-old/src/dapps/chaindeploy/Application/application.css diff --git a/js/src/dapps/chaindeploy/Application/application.js b/js-old/src/dapps/chaindeploy/Application/application.js similarity index 100% rename from js/src/dapps/chaindeploy/Application/application.js rename to js-old/src/dapps/chaindeploy/Application/application.js diff --git a/js/src/dapps/chaindeploy/Application/index.js b/js-old/src/dapps/chaindeploy/Application/index.js similarity index 100% rename from js/src/dapps/chaindeploy/Application/index.js rename to js-old/src/dapps/chaindeploy/Application/index.js diff --git a/js/src/dapps/chaindeploy/Contract/contract.js b/js-old/src/dapps/chaindeploy/Contract/contract.js similarity index 100% rename from js/src/dapps/chaindeploy/Contract/contract.js rename to js-old/src/dapps/chaindeploy/Contract/contract.js diff --git a/js/src/dapps/chaindeploy/Contract/index.js b/js-old/src/dapps/chaindeploy/Contract/index.js similarity index 100% rename from js/src/dapps/chaindeploy/Contract/index.js rename to js-old/src/dapps/chaindeploy/Contract/index.js diff --git a/js/src/dapps/chaindeploy/Dapp/dapp.js b/js-old/src/dapps/chaindeploy/Dapp/dapp.js similarity index 100% rename from js/src/dapps/chaindeploy/Dapp/dapp.js rename to js-old/src/dapps/chaindeploy/Dapp/dapp.js diff --git a/js/src/dapps/chaindeploy/Dapp/index.js b/js-old/src/dapps/chaindeploy/Dapp/index.js similarity index 100% rename from js/src/dapps/chaindeploy/Dapp/index.js rename to js-old/src/dapps/chaindeploy/Dapp/index.js diff --git a/js/src/dapps/chaindeploy/ListItem/Header/header.js b/js-old/src/dapps/chaindeploy/ListItem/Header/header.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/Header/header.js rename to js-old/src/dapps/chaindeploy/ListItem/Header/header.js diff --git a/js/src/dapps/chaindeploy/ListItem/Header/index.js b/js-old/src/dapps/chaindeploy/ListItem/Header/index.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/Header/index.js rename to js-old/src/dapps/chaindeploy/ListItem/Header/index.js diff --git a/js/src/dapps/chaindeploy/ListItem/Icon/icon.js b/js-old/src/dapps/chaindeploy/ListItem/Icon/icon.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/Icon/icon.js rename to js-old/src/dapps/chaindeploy/ListItem/Icon/icon.js diff --git a/js/src/dapps/chaindeploy/ListItem/Icon/index.js b/js-old/src/dapps/chaindeploy/ListItem/Icon/index.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/Icon/index.js rename to js-old/src/dapps/chaindeploy/ListItem/Icon/index.js diff --git a/js/src/dapps/chaindeploy/ListItem/Row/index.js b/js-old/src/dapps/chaindeploy/ListItem/Row/index.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/Row/index.js rename to js-old/src/dapps/chaindeploy/ListItem/Row/index.js diff --git a/js/src/dapps/chaindeploy/ListItem/Row/row.js b/js-old/src/dapps/chaindeploy/ListItem/Row/row.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/Row/row.js rename to js-old/src/dapps/chaindeploy/ListItem/Row/row.js diff --git a/js/src/dapps/chaindeploy/ListItem/index.js b/js-old/src/dapps/chaindeploy/ListItem/index.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/index.js rename to js-old/src/dapps/chaindeploy/ListItem/index.js diff --git a/js/src/dapps/chaindeploy/ListItem/listItem.css b/js-old/src/dapps/chaindeploy/ListItem/listItem.css similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/listItem.css rename to js-old/src/dapps/chaindeploy/ListItem/listItem.css diff --git a/js/src/dapps/chaindeploy/ListItem/listItem.js b/js-old/src/dapps/chaindeploy/ListItem/listItem.js similarity index 100% rename from js/src/dapps/chaindeploy/ListItem/listItem.js rename to js-old/src/dapps/chaindeploy/ListItem/listItem.js diff --git a/js/src/dapps/chaindeploy/_dapps.js b/js-old/src/dapps/chaindeploy/_dapps.js similarity index 100% rename from js/src/dapps/chaindeploy/_dapps.js rename to js-old/src/dapps/chaindeploy/_dapps.js diff --git a/js/src/dapps/chaindeploy/contracts/abi/jg-voting.json b/js-old/src/dapps/chaindeploy/contracts/abi/jg-voting.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/abi/jg-voting.json rename to js-old/src/dapps/chaindeploy/contracts/abi/jg-voting.json diff --git a/js/src/dapps/chaindeploy/contracts/badgereg.js b/js-old/src/dapps/chaindeploy/contracts/badgereg.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/badgereg.js rename to js-old/src/dapps/chaindeploy/contracts/badgereg.js diff --git a/js/src/dapps/chaindeploy/contracts/code/badgereg.json b/js-old/src/dapps/chaindeploy/contracts/code/badgereg.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/badgereg.json rename to js-old/src/dapps/chaindeploy/contracts/code/badgereg.json diff --git a/js/src/dapps/chaindeploy/contracts/code/dappreg.json b/js-old/src/dapps/chaindeploy/contracts/code/dappreg.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/dappreg.json rename to js-old/src/dapps/chaindeploy/contracts/code/dappreg.json diff --git a/js/src/dapps/chaindeploy/contracts/code/gavcoin.json b/js-old/src/dapps/chaindeploy/contracts/code/gavcoin.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/gavcoin.json rename to js-old/src/dapps/chaindeploy/contracts/code/gavcoin.json diff --git a/js/src/dapps/chaindeploy/contracts/code/githubhint.json b/js-old/src/dapps/chaindeploy/contracts/code/githubhint.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/githubhint.json rename to js-old/src/dapps/chaindeploy/contracts/code/githubhint.json diff --git a/js/src/dapps/chaindeploy/contracts/code/jg-voting.json b/js-old/src/dapps/chaindeploy/contracts/code/jg-voting.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/jg-voting.json rename to js-old/src/dapps/chaindeploy/contracts/code/jg-voting.json diff --git a/js/src/dapps/chaindeploy/contracts/code/registry.json b/js-old/src/dapps/chaindeploy/contracts/code/registry.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/registry.json rename to js-old/src/dapps/chaindeploy/contracts/code/registry.json diff --git a/js/src/dapps/chaindeploy/contracts/code/signaturereg.json b/js-old/src/dapps/chaindeploy/contracts/code/signaturereg.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/signaturereg.json rename to js-old/src/dapps/chaindeploy/contracts/code/signaturereg.json diff --git a/js/src/dapps/chaindeploy/contracts/code/tokendeploy.json b/js-old/src/dapps/chaindeploy/contracts/code/tokendeploy.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/tokendeploy.json rename to js-old/src/dapps/chaindeploy/contracts/code/tokendeploy.json diff --git a/js/src/dapps/chaindeploy/contracts/code/tokenreg.json b/js-old/src/dapps/chaindeploy/contracts/code/tokenreg.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/tokenreg.json rename to js-old/src/dapps/chaindeploy/contracts/code/tokenreg.json diff --git a/js/src/dapps/chaindeploy/contracts/code/verifyEmail.json b/js-old/src/dapps/chaindeploy/contracts/code/verifyEmail.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/verifyEmail.json rename to js-old/src/dapps/chaindeploy/contracts/code/verifyEmail.json diff --git a/js/src/dapps/chaindeploy/contracts/code/verifySms.json b/js-old/src/dapps/chaindeploy/contracts/code/verifySms.json similarity index 100% rename from js/src/dapps/chaindeploy/contracts/code/verifySms.json rename to js-old/src/dapps/chaindeploy/contracts/code/verifySms.json diff --git a/js/src/dapps/chaindeploy/contracts/dappreg.js b/js-old/src/dapps/chaindeploy/contracts/dappreg.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/dappreg.js rename to js-old/src/dapps/chaindeploy/contracts/dappreg.js diff --git a/js/src/dapps/chaindeploy/contracts/gavcoin.js b/js-old/src/dapps/chaindeploy/contracts/gavcoin.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/gavcoin.js rename to js-old/src/dapps/chaindeploy/contracts/gavcoin.js diff --git a/js/src/dapps/chaindeploy/contracts/githubhint.js b/js-old/src/dapps/chaindeploy/contracts/githubhint.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/githubhint.js rename to js-old/src/dapps/chaindeploy/contracts/githubhint.js diff --git a/js/src/dapps/chaindeploy/contracts/index.js b/js-old/src/dapps/chaindeploy/contracts/index.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/index.js rename to js-old/src/dapps/chaindeploy/contracts/index.js diff --git a/js/src/dapps/chaindeploy/contracts/jg-voting.js b/js-old/src/dapps/chaindeploy/contracts/jg-voting.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/jg-voting.js rename to js-old/src/dapps/chaindeploy/contracts/jg-voting.js diff --git a/js/src/dapps/chaindeploy/contracts/registry.js b/js-old/src/dapps/chaindeploy/contracts/registry.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/registry.js rename to js-old/src/dapps/chaindeploy/contracts/registry.js diff --git a/js/src/dapps/chaindeploy/contracts/signaturereg.js b/js-old/src/dapps/chaindeploy/contracts/signaturereg.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/signaturereg.js rename to js-old/src/dapps/chaindeploy/contracts/signaturereg.js diff --git a/js/src/dapps/chaindeploy/contracts/tokendeployMgr.js b/js-old/src/dapps/chaindeploy/contracts/tokendeployMgr.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/tokendeployMgr.js rename to js-old/src/dapps/chaindeploy/contracts/tokendeployMgr.js diff --git a/js/src/dapps/chaindeploy/contracts/tokendeployReg.js b/js-old/src/dapps/chaindeploy/contracts/tokendeployReg.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/tokendeployReg.js rename to js-old/src/dapps/chaindeploy/contracts/tokendeployReg.js diff --git a/js/src/dapps/chaindeploy/contracts/tokenreg.js b/js-old/src/dapps/chaindeploy/contracts/tokenreg.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/tokenreg.js rename to js-old/src/dapps/chaindeploy/contracts/tokenreg.js diff --git a/js/src/dapps/chaindeploy/contracts/verifyEmail.js b/js-old/src/dapps/chaindeploy/contracts/verifyEmail.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/verifyEmail.js rename to js-old/src/dapps/chaindeploy/contracts/verifyEmail.js diff --git a/js/src/dapps/chaindeploy/contracts/verifySms.js b/js-old/src/dapps/chaindeploy/contracts/verifySms.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/verifySms.js rename to js-old/src/dapps/chaindeploy/contracts/verifySms.js diff --git a/js/src/dapps/chaindeploy/contracts/wallet.js b/js-old/src/dapps/chaindeploy/contracts/wallet.js similarity index 100% rename from js/src/dapps/chaindeploy/contracts/wallet.js rename to js-old/src/dapps/chaindeploy/contracts/wallet.js diff --git a/js/src/dapps/chaindeploy/dapps/console.js b/js-old/src/dapps/chaindeploy/dapps/console.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/console.js rename to js-old/src/dapps/chaindeploy/dapps/console.js diff --git a/js/src/dapps/chaindeploy/dapps/dappreg.js b/js-old/src/dapps/chaindeploy/dapps/dappreg.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/dappreg.js rename to js-old/src/dapps/chaindeploy/dapps/dappreg.js diff --git a/js/src/dapps/chaindeploy/dapps/gavcoin.js b/js-old/src/dapps/chaindeploy/dapps/gavcoin.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/gavcoin.js rename to js-old/src/dapps/chaindeploy/dapps/gavcoin.js diff --git a/js/src/dapps/chaindeploy/dapps/githubhint.js b/js-old/src/dapps/chaindeploy/dapps/githubhint.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/githubhint.js rename to js-old/src/dapps/chaindeploy/dapps/githubhint.js diff --git a/js/src/dapps/chaindeploy/dapps/index.js b/js-old/src/dapps/chaindeploy/dapps/index.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/index.js rename to js-old/src/dapps/chaindeploy/dapps/index.js diff --git a/js/src/dapps/chaindeploy/dapps/jg-voting.js b/js-old/src/dapps/chaindeploy/dapps/jg-voting.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/jg-voting.js rename to js-old/src/dapps/chaindeploy/dapps/jg-voting.js diff --git a/js/src/dapps/chaindeploy/dapps/jg-whenblock.js b/js-old/src/dapps/chaindeploy/dapps/jg-whenblock.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/jg-whenblock.js rename to js-old/src/dapps/chaindeploy/dapps/jg-whenblock.js diff --git a/js/src/dapps/chaindeploy/dapps/localtx.js b/js-old/src/dapps/chaindeploy/dapps/localtx.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/localtx.js rename to js-old/src/dapps/chaindeploy/dapps/localtx.js diff --git a/js/src/dapps/chaindeploy/dapps/registry.js b/js-old/src/dapps/chaindeploy/dapps/registry.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/registry.js rename to js-old/src/dapps/chaindeploy/dapps/registry.js diff --git a/js/src/dapps/chaindeploy/dapps/signaturereg.js b/js-old/src/dapps/chaindeploy/dapps/signaturereg.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/signaturereg.js rename to js-old/src/dapps/chaindeploy/dapps/signaturereg.js diff --git a/js/src/dapps/chaindeploy/dapps/tokendeploy.js b/js-old/src/dapps/chaindeploy/dapps/tokendeploy.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/tokendeploy.js rename to js-old/src/dapps/chaindeploy/dapps/tokendeploy.js diff --git a/js/src/dapps/chaindeploy/dapps/tokenreg.js b/js-old/src/dapps/chaindeploy/dapps/tokenreg.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/tokenreg.js rename to js-old/src/dapps/chaindeploy/dapps/tokenreg.js diff --git a/js/src/dapps/chaindeploy/dapps/web.js b/js-old/src/dapps/chaindeploy/dapps/web.js similarity index 100% rename from js/src/dapps/chaindeploy/dapps/web.js rename to js-old/src/dapps/chaindeploy/dapps/web.js diff --git a/js/src/dapps/chaindeploy/parity.js b/js-old/src/dapps/chaindeploy/parity.js similarity index 100% rename from js/src/dapps/chaindeploy/parity.js rename to js-old/src/dapps/chaindeploy/parity.js diff --git a/js/src/dapps/chaindeploy/store.js b/js-old/src/dapps/chaindeploy/store.js similarity index 100% rename from js/src/dapps/chaindeploy/store.js rename to js-old/src/dapps/chaindeploy/store.js diff --git a/js/src/dapps/chaindeploy/utils.js b/js-old/src/dapps/chaindeploy/utils.js similarity index 100% rename from js/src/dapps/chaindeploy/utils.js rename to js-old/src/dapps/chaindeploy/utils.js diff --git a/js/src/dapps/console.js b/js-old/src/dapps/console.js similarity index 100% rename from js/src/dapps/console.js rename to js-old/src/dapps/console.js diff --git a/js/src/dapps/console/Application/application.css b/js-old/src/dapps/console/Application/application.css similarity index 100% rename from js/src/dapps/console/Application/application.css rename to js-old/src/dapps/console/Application/application.css diff --git a/js/src/dapps/console/Application/application.js b/js-old/src/dapps/console/Application/application.js similarity index 100% rename from js/src/dapps/console/Application/application.js rename to js-old/src/dapps/console/Application/application.js diff --git a/js/src/dapps/console/Application/application.store.js b/js-old/src/dapps/console/Application/application.store.js similarity index 100% rename from js/src/dapps/console/Application/application.store.js rename to js-old/src/dapps/console/Application/application.store.js diff --git a/js/src/dapps/console/Application/index.js b/js-old/src/dapps/console/Application/index.js similarity index 100% rename from js/src/dapps/console/Application/index.js rename to js-old/src/dapps/console/Application/index.js diff --git a/js/src/dapps/console/Autocomplete/autocomplete.css b/js-old/src/dapps/console/Autocomplete/autocomplete.css similarity index 100% rename from js/src/dapps/console/Autocomplete/autocomplete.css rename to js-old/src/dapps/console/Autocomplete/autocomplete.css diff --git a/js/src/dapps/console/Autocomplete/autocomplete.js b/js-old/src/dapps/console/Autocomplete/autocomplete.js similarity index 100% rename from js/src/dapps/console/Autocomplete/autocomplete.js rename to js-old/src/dapps/console/Autocomplete/autocomplete.js diff --git a/js/src/dapps/console/Autocomplete/autocomplete.store.js b/js-old/src/dapps/console/Autocomplete/autocomplete.store.js similarity index 100% rename from js/src/dapps/console/Autocomplete/autocomplete.store.js rename to js-old/src/dapps/console/Autocomplete/autocomplete.store.js diff --git a/js/src/dapps/console/Autocomplete/index.js b/js-old/src/dapps/console/Autocomplete/index.js similarity index 100% rename from js/src/dapps/console/Autocomplete/index.js rename to js-old/src/dapps/console/Autocomplete/index.js diff --git a/js/src/dapps/console/Console/console.css b/js-old/src/dapps/console/Console/console.css similarity index 100% rename from js/src/dapps/console/Console/console.css rename to js-old/src/dapps/console/Console/console.css diff --git a/js/src/dapps/console/Console/console.js b/js-old/src/dapps/console/Console/console.js similarity index 100% rename from js/src/dapps/console/Console/console.js rename to js-old/src/dapps/console/Console/console.js diff --git a/js/src/dapps/console/Console/console.store.js b/js-old/src/dapps/console/Console/console.store.js similarity index 100% rename from js/src/dapps/console/Console/console.store.js rename to js-old/src/dapps/console/Console/console.store.js diff --git a/js/src/dapps/console/Console/index.js b/js-old/src/dapps/console/Console/index.js similarity index 100% rename from js/src/dapps/console/Console/index.js rename to js-old/src/dapps/console/Console/index.js diff --git a/js/src/dapps/console/Header/header.css b/js-old/src/dapps/console/Header/header.css similarity index 100% rename from js/src/dapps/console/Header/header.css rename to js-old/src/dapps/console/Header/header.css diff --git a/js/src/dapps/console/Header/header.js b/js-old/src/dapps/console/Header/header.js similarity index 100% rename from js/src/dapps/console/Header/header.js rename to js-old/src/dapps/console/Header/header.js diff --git a/js/src/dapps/console/Header/index.js b/js-old/src/dapps/console/Header/index.js similarity index 100% rename from js/src/dapps/console/Header/index.js rename to js-old/src/dapps/console/Header/index.js diff --git a/js/src/dapps/console/Input/index.js b/js-old/src/dapps/console/Input/index.js similarity index 100% rename from js/src/dapps/console/Input/index.js rename to js-old/src/dapps/console/Input/index.js diff --git a/js/src/dapps/console/Input/input.css b/js-old/src/dapps/console/Input/input.css similarity index 100% rename from js/src/dapps/console/Input/input.css rename to js-old/src/dapps/console/Input/input.css diff --git a/js/src/dapps/console/Input/input.js b/js-old/src/dapps/console/Input/input.js similarity index 100% rename from js/src/dapps/console/Input/input.js rename to js-old/src/dapps/console/Input/input.js diff --git a/js/src/dapps/console/Input/input.store.js b/js-old/src/dapps/console/Input/input.store.js similarity index 100% rename from js/src/dapps/console/Input/input.store.js rename to js-old/src/dapps/console/Input/input.store.js diff --git a/js/src/dapps/console/Settings/index.js b/js-old/src/dapps/console/Settings/index.js similarity index 100% rename from js/src/dapps/console/Settings/index.js rename to js-old/src/dapps/console/Settings/index.js diff --git a/js/src/dapps/console/Settings/settings.css b/js-old/src/dapps/console/Settings/settings.css similarity index 100% rename from js/src/dapps/console/Settings/settings.css rename to js-old/src/dapps/console/Settings/settings.css diff --git a/js/src/dapps/console/Settings/settings.js b/js-old/src/dapps/console/Settings/settings.js similarity index 100% rename from js/src/dapps/console/Settings/settings.js rename to js-old/src/dapps/console/Settings/settings.js diff --git a/js/src/dapps/console/Settings/settings.store.js b/js-old/src/dapps/console/Settings/settings.store.js similarity index 100% rename from js/src/dapps/console/Settings/settings.store.js rename to js-old/src/dapps/console/Settings/settings.store.js diff --git a/js/src/dapps/console/Snippets/index.js b/js-old/src/dapps/console/Snippets/index.js similarity index 100% rename from js/src/dapps/console/Snippets/index.js rename to js-old/src/dapps/console/Snippets/index.js diff --git a/js/src/dapps/console/Snippets/snippets.css b/js-old/src/dapps/console/Snippets/snippets.css similarity index 100% rename from js/src/dapps/console/Snippets/snippets.css rename to js-old/src/dapps/console/Snippets/snippets.css diff --git a/js/src/dapps/console/Snippets/snippets.js b/js-old/src/dapps/console/Snippets/snippets.js similarity index 100% rename from js/src/dapps/console/Snippets/snippets.js rename to js-old/src/dapps/console/Snippets/snippets.js diff --git a/js/src/dapps/console/Snippets/snippets.store.js b/js-old/src/dapps/console/Snippets/snippets.store.js similarity index 100% rename from js/src/dapps/console/Snippets/snippets.store.js rename to js-old/src/dapps/console/Snippets/snippets.store.js diff --git a/js/src/dapps/console/Watches/index.js b/js-old/src/dapps/console/Watches/index.js similarity index 100% rename from js/src/dapps/console/Watches/index.js rename to js-old/src/dapps/console/Watches/index.js diff --git a/js/src/dapps/console/Watches/watches.css b/js-old/src/dapps/console/Watches/watches.css similarity index 100% rename from js/src/dapps/console/Watches/watches.css rename to js-old/src/dapps/console/Watches/watches.css diff --git a/js/src/dapps/console/Watches/watches.js b/js-old/src/dapps/console/Watches/watches.js similarity index 100% rename from js/src/dapps/console/Watches/watches.js rename to js-old/src/dapps/console/Watches/watches.js diff --git a/js/src/dapps/console/Watches/watches.store.js b/js-old/src/dapps/console/Watches/watches.store.js similarity index 100% rename from js/src/dapps/console/Watches/watches.store.js rename to js-old/src/dapps/console/Watches/watches.store.js diff --git a/js/src/dapps/console/codemirror.css b/js-old/src/dapps/console/codemirror.css similarity index 100% rename from js/src/dapps/console/codemirror.css rename to js-old/src/dapps/console/codemirror.css diff --git a/js/src/dapps/console/parity.js b/js-old/src/dapps/console/parity.js similarity index 100% rename from js/src/dapps/console/parity.js rename to js-old/src/dapps/console/parity.js diff --git a/js/src/dapps/console/utils.js b/js-old/src/dapps/console/utils.js similarity index 100% rename from js/src/dapps/console/utils.js rename to js-old/src/dapps/console/utils.js diff --git a/js/src/dapps/dappreg.js b/js-old/src/dapps/dappreg.js similarity index 100% rename from js/src/dapps/dappreg.js rename to js-old/src/dapps/dappreg.js diff --git a/js/src/dapps/dappreg/Application/application.css b/js-old/src/dapps/dappreg/Application/application.css similarity index 100% rename from js/src/dapps/dappreg/Application/application.css rename to js-old/src/dapps/dappreg/Application/application.css diff --git a/js/src/dapps/dappreg/Application/application.js b/js-old/src/dapps/dappreg/Application/application.js similarity index 100% rename from js/src/dapps/dappreg/Application/application.js rename to js-old/src/dapps/dappreg/Application/application.js diff --git a/js/src/dapps/dappreg/Application/index.js b/js-old/src/dapps/dappreg/Application/index.js similarity index 100% rename from js/src/dapps/dappreg/Application/index.js rename to js-old/src/dapps/dappreg/Application/index.js diff --git a/js/src/dapps/dappreg/Button/button.css b/js-old/src/dapps/dappreg/Button/button.css similarity index 100% rename from js/src/dapps/dappreg/Button/button.css rename to js-old/src/dapps/dappreg/Button/button.css diff --git a/js/src/dapps/dappreg/Button/button.js b/js-old/src/dapps/dappreg/Button/button.js similarity index 100% rename from js/src/dapps/dappreg/Button/button.js rename to js-old/src/dapps/dappreg/Button/button.js diff --git a/js/src/dapps/dappreg/Button/index.js b/js-old/src/dapps/dappreg/Button/index.js similarity index 100% rename from js/src/dapps/dappreg/Button/index.js rename to js-old/src/dapps/dappreg/Button/index.js diff --git a/js/src/dapps/dappreg/Card/card.css b/js-old/src/dapps/dappreg/Card/card.css similarity index 100% rename from js/src/dapps/dappreg/Card/card.css rename to js-old/src/dapps/dappreg/Card/card.css diff --git a/js/src/dapps/dappreg/Card/card.js b/js-old/src/dapps/dappreg/Card/card.js similarity index 100% rename from js/src/dapps/dappreg/Card/card.js rename to js-old/src/dapps/dappreg/Card/card.js diff --git a/js/src/dapps/dappreg/Card/index.js b/js-old/src/dapps/dappreg/Card/index.js similarity index 100% rename from js/src/dapps/dappreg/Card/index.js rename to js-old/src/dapps/dappreg/Card/index.js diff --git a/js/src/dapps/dappreg/CreateDappCard/createDappCard.js b/js-old/src/dapps/dappreg/CreateDappCard/createDappCard.js similarity index 100% rename from js/src/dapps/dappreg/CreateDappCard/createDappCard.js rename to js-old/src/dapps/dappreg/CreateDappCard/createDappCard.js diff --git a/js/src/dapps/dappreg/CreateDappCard/index.js b/js-old/src/dapps/dappreg/CreateDappCard/index.js similarity index 100% rename from js/src/dapps/dappreg/CreateDappCard/index.js rename to js-old/src/dapps/dappreg/CreateDappCard/index.js diff --git a/js/src/dapps/dappreg/DappCard/dappCard.css b/js-old/src/dapps/dappreg/DappCard/dappCard.css similarity index 100% rename from js/src/dapps/dappreg/DappCard/dappCard.css rename to js-old/src/dapps/dappreg/DappCard/dappCard.css diff --git a/js/src/dapps/dappreg/DappCard/dappCard.js b/js-old/src/dapps/dappreg/DappCard/dappCard.js similarity index 100% rename from js/src/dapps/dappreg/DappCard/dappCard.js rename to js-old/src/dapps/dappreg/DappCard/dappCard.js diff --git a/js/src/dapps/dappreg/DappCard/index.js b/js-old/src/dapps/dappreg/DappCard/index.js similarity index 100% rename from js/src/dapps/dappreg/DappCard/index.js rename to js-old/src/dapps/dappreg/DappCard/index.js diff --git a/js/src/dapps/dappreg/DappModal/dappModal.css b/js-old/src/dapps/dappreg/DappModal/dappModal.css similarity index 100% rename from js/src/dapps/dappreg/DappModal/dappModal.css rename to js-old/src/dapps/dappreg/DappModal/dappModal.css diff --git a/js/src/dapps/dappreg/DappModal/dappModal.js b/js-old/src/dapps/dappreg/DappModal/dappModal.js similarity index 100% rename from js/src/dapps/dappreg/DappModal/dappModal.js rename to js-old/src/dapps/dappreg/DappModal/dappModal.js diff --git a/js/src/dapps/dappreg/DappModal/index.js b/js-old/src/dapps/dappreg/DappModal/index.js similarity index 100% rename from js/src/dapps/dappreg/DappModal/index.js rename to js-old/src/dapps/dappreg/DappModal/index.js diff --git a/js/src/dapps/dappreg/Dapps/dapps.css b/js-old/src/dapps/dappreg/Dapps/dapps.css similarity index 100% rename from js/src/dapps/dappreg/Dapps/dapps.css rename to js-old/src/dapps/dappreg/Dapps/dapps.css diff --git a/js/src/dapps/dappreg/Dapps/dapps.js b/js-old/src/dapps/dappreg/Dapps/dapps.js similarity index 100% rename from js/src/dapps/dappreg/Dapps/dapps.js rename to js-old/src/dapps/dappreg/Dapps/dapps.js diff --git a/js/src/dapps/dappreg/Dapps/index.js b/js-old/src/dapps/dappreg/Dapps/index.js similarity index 100% rename from js/src/dapps/dappreg/Dapps/index.js rename to js-old/src/dapps/dappreg/Dapps/index.js diff --git a/js/src/dapps/dappreg/Input/index.js b/js-old/src/dapps/dappreg/Input/index.js similarity index 100% rename from js/src/dapps/dappreg/Input/index.js rename to js-old/src/dapps/dappreg/Input/index.js diff --git a/js/src/dapps/dappreg/Input/input.css b/js-old/src/dapps/dappreg/Input/input.css similarity index 100% rename from js/src/dapps/dappreg/Input/input.css rename to js-old/src/dapps/dappreg/Input/input.css diff --git a/js/src/dapps/dappreg/Input/input.js b/js-old/src/dapps/dappreg/Input/input.js similarity index 100% rename from js/src/dapps/dappreg/Input/input.js rename to js-old/src/dapps/dappreg/Input/input.js diff --git a/js/src/dapps/dappreg/Modal/index.js b/js-old/src/dapps/dappreg/Modal/index.js similarity index 100% rename from js/src/dapps/dappreg/Modal/index.js rename to js-old/src/dapps/dappreg/Modal/index.js diff --git a/js/src/dapps/dappreg/Modal/modal.css b/js-old/src/dapps/dappreg/Modal/modal.css similarity index 100% rename from js/src/dapps/dappreg/Modal/modal.css rename to js-old/src/dapps/dappreg/Modal/modal.css diff --git a/js/src/dapps/dappreg/Modal/modal.js b/js-old/src/dapps/dappreg/Modal/modal.js similarity index 100% rename from js/src/dapps/dappreg/Modal/modal.js rename to js-old/src/dapps/dappreg/Modal/modal.js diff --git a/js/src/dapps/dappreg/ModalDelete/index.js b/js-old/src/dapps/dappreg/ModalDelete/index.js similarity index 100% rename from js/src/dapps/dappreg/ModalDelete/index.js rename to js-old/src/dapps/dappreg/ModalDelete/index.js diff --git a/js/src/dapps/dappreg/ModalDelete/modalDelete.js b/js-old/src/dapps/dappreg/ModalDelete/modalDelete.js similarity index 100% rename from js/src/dapps/dappreg/ModalDelete/modalDelete.js rename to js-old/src/dapps/dappreg/ModalDelete/modalDelete.js diff --git a/js/src/dapps/dappreg/ModalRegister/index.js b/js-old/src/dapps/dappreg/ModalRegister/index.js similarity index 100% rename from js/src/dapps/dappreg/ModalRegister/index.js rename to js-old/src/dapps/dappreg/ModalRegister/index.js diff --git a/js/src/dapps/dappreg/ModalRegister/modalRegister.js b/js-old/src/dapps/dappreg/ModalRegister/modalRegister.js similarity index 100% rename from js/src/dapps/dappreg/ModalRegister/modalRegister.js rename to js-old/src/dapps/dappreg/ModalRegister/modalRegister.js diff --git a/js/src/dapps/dappreg/ModalUpdate/index.js b/js-old/src/dapps/dappreg/ModalUpdate/index.js similarity index 100% rename from js/src/dapps/dappreg/ModalUpdate/index.js rename to js-old/src/dapps/dappreg/ModalUpdate/index.js diff --git a/js/src/dapps/dappreg/ModalUpdate/modalUpdate.js b/js-old/src/dapps/dappreg/ModalUpdate/modalUpdate.js similarity index 100% rename from js/src/dapps/dappreg/ModalUpdate/modalUpdate.js rename to js-old/src/dapps/dappreg/ModalUpdate/modalUpdate.js diff --git a/js/src/dapps/dappreg/SelectAccount/index.js b/js-old/src/dapps/dappreg/SelectAccount/index.js similarity index 100% rename from js/src/dapps/dappreg/SelectAccount/index.js rename to js-old/src/dapps/dappreg/SelectAccount/index.js diff --git a/js/src/dapps/dappreg/SelectAccount/selectAccount.js b/js-old/src/dapps/dappreg/SelectAccount/selectAccount.js similarity index 100% rename from js/src/dapps/dappreg/SelectAccount/selectAccount.js rename to js-old/src/dapps/dappreg/SelectAccount/selectAccount.js diff --git a/js/src/dapps/dappreg/Transactions/index.js b/js-old/src/dapps/dappreg/Transactions/index.js similarity index 100% rename from js/src/dapps/dappreg/Transactions/index.js rename to js-old/src/dapps/dappreg/Transactions/index.js diff --git a/js/src/dapps/dappreg/Transactions/transactions.css b/js-old/src/dapps/dappreg/Transactions/transactions.css similarity index 100% rename from js/src/dapps/dappreg/Transactions/transactions.css rename to js-old/src/dapps/dappreg/Transactions/transactions.css diff --git a/js/src/dapps/dappreg/Transactions/transactions.js b/js-old/src/dapps/dappreg/Transactions/transactions.js similarity index 100% rename from js/src/dapps/dappreg/Transactions/transactions.js rename to js-old/src/dapps/dappreg/Transactions/transactions.js diff --git a/js/src/dapps/dappreg/Warning/index.js b/js-old/src/dapps/dappreg/Warning/index.js similarity index 100% rename from js/src/dapps/dappreg/Warning/index.js rename to js-old/src/dapps/dappreg/Warning/index.js diff --git a/js/src/dapps/dappreg/Warning/warning.css b/js-old/src/dapps/dappreg/Warning/warning.css similarity index 100% rename from js/src/dapps/dappreg/Warning/warning.css rename to js-old/src/dapps/dappreg/Warning/warning.css diff --git a/js/src/dapps/dappreg/Warning/warning.js b/js-old/src/dapps/dappreg/Warning/warning.js similarity index 100% rename from js/src/dapps/dappreg/Warning/warning.js rename to js-old/src/dapps/dappreg/Warning/warning.js diff --git a/js/src/dapps/dappreg/_colors.css b/js-old/src/dapps/dappreg/_colors.css similarity index 100% rename from js/src/dapps/dappreg/_colors.css rename to js-old/src/dapps/dappreg/_colors.css diff --git a/js/src/dapps/dappreg/_utils.css b/js-old/src/dapps/dappreg/_utils.css similarity index 100% rename from js/src/dapps/dappreg/_utils.css rename to js-old/src/dapps/dappreg/_utils.css diff --git a/js/src/dapps/dappreg/dappStore.js b/js-old/src/dapps/dappreg/dappStore.js similarity index 100% rename from js/src/dapps/dappreg/dappStore.js rename to js-old/src/dapps/dappreg/dappStore.js diff --git a/js/src/dapps/dappreg/dappsStore.js b/js-old/src/dapps/dappreg/dappsStore.js similarity index 100% rename from js/src/dapps/dappreg/dappsStore.js rename to js-old/src/dapps/dappreg/dappsStore.js diff --git a/js/src/dapps/dappreg/parity.js b/js-old/src/dapps/dappreg/parity.js similarity index 100% rename from js/src/dapps/dappreg/parity.js rename to js-old/src/dapps/dappreg/parity.js diff --git a/js/src/dapps/dappreg/utils.js b/js-old/src/dapps/dappreg/utils.js similarity index 100% rename from js/src/dapps/dappreg/utils.js rename to js-old/src/dapps/dappreg/utils.js diff --git a/js/src/dapps/dappreg/utils.spec.js b/js-old/src/dapps/dappreg/utils.spec.js similarity index 100% rename from js/src/dapps/dappreg/utils.spec.js rename to js-old/src/dapps/dappreg/utils.spec.js diff --git a/js/src/dapps/githubhint.js b/js-old/src/dapps/githubhint.js similarity index 100% rename from js/src/dapps/githubhint.js rename to js-old/src/dapps/githubhint.js diff --git a/js/src/dapps/githubhint/Application/application.css b/js-old/src/dapps/githubhint/Application/application.css similarity index 100% rename from js/src/dapps/githubhint/Application/application.css rename to js-old/src/dapps/githubhint/Application/application.css diff --git a/js/src/dapps/githubhint/Application/application.js b/js-old/src/dapps/githubhint/Application/application.js similarity index 100% rename from js/src/dapps/githubhint/Application/application.js rename to js-old/src/dapps/githubhint/Application/application.js diff --git a/js/src/dapps/githubhint/Application/index.js b/js-old/src/dapps/githubhint/Application/index.js similarity index 100% rename from js/src/dapps/githubhint/Application/index.js rename to js-old/src/dapps/githubhint/Application/index.js diff --git a/js/src/dapps/githubhint/Button/button.css b/js-old/src/dapps/githubhint/Button/button.css similarity index 100% rename from js/src/dapps/githubhint/Button/button.css rename to js-old/src/dapps/githubhint/Button/button.css diff --git a/js/src/dapps/githubhint/Button/button.js b/js-old/src/dapps/githubhint/Button/button.js similarity index 100% rename from js/src/dapps/githubhint/Button/button.js rename to js-old/src/dapps/githubhint/Button/button.js diff --git a/js/src/dapps/githubhint/Button/index.js b/js-old/src/dapps/githubhint/Button/index.js similarity index 100% rename from js/src/dapps/githubhint/Button/index.js rename to js-old/src/dapps/githubhint/Button/index.js diff --git a/js/src/dapps/githubhint/Events/events.css b/js-old/src/dapps/githubhint/Events/events.css similarity index 100% rename from js/src/dapps/githubhint/Events/events.css rename to js-old/src/dapps/githubhint/Events/events.css diff --git a/js/src/dapps/githubhint/Events/events.js b/js-old/src/dapps/githubhint/Events/events.js similarity index 100% rename from js/src/dapps/githubhint/Events/events.js rename to js-old/src/dapps/githubhint/Events/events.js diff --git a/js/src/dapps/githubhint/Events/index.js b/js-old/src/dapps/githubhint/Events/index.js similarity index 100% rename from js/src/dapps/githubhint/Events/index.js rename to js-old/src/dapps/githubhint/Events/index.js diff --git a/js/src/dapps/githubhint/Loading/index.js b/js-old/src/dapps/githubhint/Loading/index.js similarity index 100% rename from js/src/dapps/githubhint/Loading/index.js rename to js-old/src/dapps/githubhint/Loading/index.js diff --git a/js/src/dapps/githubhint/Loading/loading.css b/js-old/src/dapps/githubhint/Loading/loading.css similarity index 100% rename from js/src/dapps/githubhint/Loading/loading.css rename to js-old/src/dapps/githubhint/Loading/loading.css diff --git a/js/src/dapps/githubhint/Loading/loading.js b/js-old/src/dapps/githubhint/Loading/loading.js similarity index 100% rename from js/src/dapps/githubhint/Loading/loading.js rename to js-old/src/dapps/githubhint/Loading/loading.js diff --git a/js/src/dapps/githubhint/parity.js b/js-old/src/dapps/githubhint/parity.js similarity index 100% rename from js/src/dapps/githubhint/parity.js rename to js-old/src/dapps/githubhint/parity.js diff --git a/js/src/dapps/githubhint/services.js b/js-old/src/dapps/githubhint/services.js similarity index 100% rename from js/src/dapps/githubhint/services.js rename to js-old/src/dapps/githubhint/services.js diff --git a/js/src/dapps/index.ejs b/js-old/src/dapps/index.ejs similarity index 100% rename from js/src/dapps/index.ejs rename to js-old/src/dapps/index.ejs diff --git a/js/src/dapps/localtx.js b/js-old/src/dapps/localtx.js similarity index 100% rename from js/src/dapps/localtx.js rename to js-old/src/dapps/localtx.js diff --git a/js/src/dapps/localtx/Application/application.css b/js-old/src/dapps/localtx/Application/application.css similarity index 100% rename from js/src/dapps/localtx/Application/application.css rename to js-old/src/dapps/localtx/Application/application.css diff --git a/js/src/dapps/localtx/Application/application.js b/js-old/src/dapps/localtx/Application/application.js similarity index 100% rename from js/src/dapps/localtx/Application/application.js rename to js-old/src/dapps/localtx/Application/application.js diff --git a/js/src/dapps/localtx/Application/application.spec.js b/js-old/src/dapps/localtx/Application/application.spec.js similarity index 100% rename from js/src/dapps/localtx/Application/application.spec.js rename to js-old/src/dapps/localtx/Application/application.spec.js diff --git a/js/src/dapps/localtx/Application/index.js b/js-old/src/dapps/localtx/Application/index.js similarity index 100% rename from js/src/dapps/localtx/Application/index.js rename to js-old/src/dapps/localtx/Application/index.js diff --git a/js/src/dapps/localtx/IdentityIcon/identityIcon.css b/js-old/src/dapps/localtx/IdentityIcon/identityIcon.css similarity index 100% rename from js/src/dapps/localtx/IdentityIcon/identityIcon.css rename to js-old/src/dapps/localtx/IdentityIcon/identityIcon.css diff --git a/js/src/dapps/localtx/IdentityIcon/identityIcon.js b/js-old/src/dapps/localtx/IdentityIcon/identityIcon.js similarity index 100% rename from js/src/dapps/localtx/IdentityIcon/identityIcon.js rename to js-old/src/dapps/localtx/IdentityIcon/identityIcon.js diff --git a/js/src/dapps/localtx/IdentityIcon/index.js b/js-old/src/dapps/localtx/IdentityIcon/index.js similarity index 100% rename from js/src/dapps/localtx/IdentityIcon/index.js rename to js-old/src/dapps/localtx/IdentityIcon/index.js diff --git a/js/src/dapps/localtx/Transaction/index.js b/js-old/src/dapps/localtx/Transaction/index.js similarity index 100% rename from js/src/dapps/localtx/Transaction/index.js rename to js-old/src/dapps/localtx/Transaction/index.js diff --git a/js/src/dapps/localtx/Transaction/transaction.css b/js-old/src/dapps/localtx/Transaction/transaction.css similarity index 100% rename from js/src/dapps/localtx/Transaction/transaction.css rename to js-old/src/dapps/localtx/Transaction/transaction.css diff --git a/js/src/dapps/localtx/Transaction/transaction.js b/js-old/src/dapps/localtx/Transaction/transaction.js similarity index 100% rename from js/src/dapps/localtx/Transaction/transaction.js rename to js-old/src/dapps/localtx/Transaction/transaction.js diff --git a/js/src/dapps/localtx/Transaction/transaction.spec.js b/js-old/src/dapps/localtx/Transaction/transaction.spec.js similarity index 100% rename from js/src/dapps/localtx/Transaction/transaction.spec.js rename to js-old/src/dapps/localtx/Transaction/transaction.spec.js diff --git a/js/src/dapps/localtx/parity.js b/js-old/src/dapps/localtx/parity.js similarity index 100% rename from js/src/dapps/localtx/parity.js rename to js-old/src/dapps/localtx/parity.js diff --git a/js/src/dapps/registry.js b/js-old/src/dapps/registry.js similarity index 100% rename from js/src/dapps/registry.js rename to js-old/src/dapps/registry.js diff --git a/js/src/dapps/registry/Accounts/accounts.css b/js-old/src/dapps/registry/Accounts/accounts.css similarity index 100% rename from js/src/dapps/registry/Accounts/accounts.css rename to js-old/src/dapps/registry/Accounts/accounts.css diff --git a/js/src/dapps/registry/Accounts/accounts.js b/js-old/src/dapps/registry/Accounts/accounts.js similarity index 100% rename from js/src/dapps/registry/Accounts/accounts.js rename to js-old/src/dapps/registry/Accounts/accounts.js diff --git a/js/src/dapps/registry/Accounts/actions.js b/js-old/src/dapps/registry/Accounts/actions.js similarity index 100% rename from js/src/dapps/registry/Accounts/actions.js rename to js-old/src/dapps/registry/Accounts/actions.js diff --git a/js/src/dapps/registry/Accounts/index.js b/js-old/src/dapps/registry/Accounts/index.js similarity index 100% rename from js/src/dapps/registry/Accounts/index.js rename to js-old/src/dapps/registry/Accounts/index.js diff --git a/js/src/dapps/registry/Application/application.css b/js-old/src/dapps/registry/Application/application.css similarity index 100% rename from js/src/dapps/registry/Application/application.css rename to js-old/src/dapps/registry/Application/application.css diff --git a/js/src/dapps/registry/Application/application.js b/js-old/src/dapps/registry/Application/application.js similarity index 100% rename from js/src/dapps/registry/Application/application.js rename to js-old/src/dapps/registry/Application/application.js diff --git a/js/src/dapps/registry/Application/index.js b/js-old/src/dapps/registry/Application/index.js similarity index 100% rename from js/src/dapps/registry/Application/index.js rename to js-old/src/dapps/registry/Application/index.js diff --git a/js/src/dapps/registry/Container.js b/js-old/src/dapps/registry/Container.js similarity index 100% rename from js/src/dapps/registry/Container.js rename to js-old/src/dapps/registry/Container.js diff --git a/js/src/dapps/registry/Events/actions.js b/js-old/src/dapps/registry/Events/actions.js similarity index 100% rename from js/src/dapps/registry/Events/actions.js rename to js-old/src/dapps/registry/Events/actions.js diff --git a/js/src/dapps/registry/Events/events.css b/js-old/src/dapps/registry/Events/events.css similarity index 100% rename from js/src/dapps/registry/Events/events.css rename to js-old/src/dapps/registry/Events/events.css diff --git a/js/src/dapps/registry/Events/events.js b/js-old/src/dapps/registry/Events/events.js similarity index 100% rename from js/src/dapps/registry/Events/events.js rename to js-old/src/dapps/registry/Events/events.js diff --git a/js/src/dapps/registry/Events/index.js b/js-old/src/dapps/registry/Events/index.js similarity index 100% rename from js/src/dapps/registry/Events/index.js rename to js-old/src/dapps/registry/Events/index.js diff --git a/js/src/dapps/registry/Events/reducers.js b/js-old/src/dapps/registry/Events/reducers.js similarity index 100% rename from js/src/dapps/registry/Events/reducers.js rename to js-old/src/dapps/registry/Events/reducers.js diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.css b/js-old/src/dapps/registry/IdentityIcon/identityIcon.css similarity index 100% rename from js/src/dapps/registry/IdentityIcon/identityIcon.css rename to js-old/src/dapps/registry/IdentityIcon/identityIcon.css diff --git a/js/src/dapps/registry/IdentityIcon/identityIcon.js b/js-old/src/dapps/registry/IdentityIcon/identityIcon.js similarity index 100% rename from js/src/dapps/registry/IdentityIcon/identityIcon.js rename to js-old/src/dapps/registry/IdentityIcon/identityIcon.js diff --git a/js/src/dapps/registry/IdentityIcon/index.js b/js-old/src/dapps/registry/IdentityIcon/index.js similarity index 100% rename from js/src/dapps/registry/IdentityIcon/index.js rename to js-old/src/dapps/registry/IdentityIcon/index.js diff --git a/js/src/dapps/registry/Lookup/actions.js b/js-old/src/dapps/registry/Lookup/actions.js similarity index 100% rename from js/src/dapps/registry/Lookup/actions.js rename to js-old/src/dapps/registry/Lookup/actions.js diff --git a/js/src/dapps/registry/Lookup/index.js b/js-old/src/dapps/registry/Lookup/index.js similarity index 100% rename from js/src/dapps/registry/Lookup/index.js rename to js-old/src/dapps/registry/Lookup/index.js diff --git a/js/src/dapps/registry/Lookup/lookup.css b/js-old/src/dapps/registry/Lookup/lookup.css similarity index 100% rename from js/src/dapps/registry/Lookup/lookup.css rename to js-old/src/dapps/registry/Lookup/lookup.css diff --git a/js/src/dapps/registry/Lookup/lookup.js b/js-old/src/dapps/registry/Lookup/lookup.js similarity index 100% rename from js/src/dapps/registry/Lookup/lookup.js rename to js-old/src/dapps/registry/Lookup/lookup.js diff --git a/js/src/dapps/registry/Lookup/reducers.js b/js-old/src/dapps/registry/Lookup/reducers.js similarity index 100% rename from js/src/dapps/registry/Lookup/reducers.js rename to js-old/src/dapps/registry/Lookup/reducers.js diff --git a/js/src/dapps/registry/Names/actions.js b/js-old/src/dapps/registry/Names/actions.js similarity index 100% rename from js/src/dapps/registry/Names/actions.js rename to js-old/src/dapps/registry/Names/actions.js diff --git a/js/src/dapps/registry/Names/index.js b/js-old/src/dapps/registry/Names/index.js similarity index 100% rename from js/src/dapps/registry/Names/index.js rename to js-old/src/dapps/registry/Names/index.js diff --git a/js/src/dapps/registry/Names/names.css b/js-old/src/dapps/registry/Names/names.css similarity index 100% rename from js/src/dapps/registry/Names/names.css rename to js-old/src/dapps/registry/Names/names.css diff --git a/js/src/dapps/registry/Names/names.js b/js-old/src/dapps/registry/Names/names.js similarity index 100% rename from js/src/dapps/registry/Names/names.js rename to js-old/src/dapps/registry/Names/names.js diff --git a/js/src/dapps/registry/Names/reducers.js b/js-old/src/dapps/registry/Names/reducers.js similarity index 100% rename from js/src/dapps/registry/Names/reducers.js rename to js-old/src/dapps/registry/Names/reducers.js diff --git a/js/src/dapps/registry/Records/actions.js b/js-old/src/dapps/registry/Records/actions.js similarity index 100% rename from js/src/dapps/registry/Records/actions.js rename to js-old/src/dapps/registry/Records/actions.js diff --git a/js/src/dapps/registry/Records/index.js b/js-old/src/dapps/registry/Records/index.js similarity index 100% rename from js/src/dapps/registry/Records/index.js rename to js-old/src/dapps/registry/Records/index.js diff --git a/js/src/dapps/registry/Records/records.css b/js-old/src/dapps/registry/Records/records.css similarity index 100% rename from js/src/dapps/registry/Records/records.css rename to js-old/src/dapps/registry/Records/records.css diff --git a/js/src/dapps/registry/Records/records.js b/js-old/src/dapps/registry/Records/records.js similarity index 100% rename from js/src/dapps/registry/Records/records.js rename to js-old/src/dapps/registry/Records/records.js diff --git a/js/src/dapps/registry/Records/reducers.js b/js-old/src/dapps/registry/Records/reducers.js similarity index 100% rename from js/src/dapps/registry/Records/reducers.js rename to js-old/src/dapps/registry/Records/reducers.js diff --git a/js/src/dapps/registry/Reverse/actions.js b/js-old/src/dapps/registry/Reverse/actions.js similarity index 100% rename from js/src/dapps/registry/Reverse/actions.js rename to js-old/src/dapps/registry/Reverse/actions.js diff --git a/js/src/dapps/registry/Reverse/index.js b/js-old/src/dapps/registry/Reverse/index.js similarity index 100% rename from js/src/dapps/registry/Reverse/index.js rename to js-old/src/dapps/registry/Reverse/index.js diff --git a/js/src/dapps/registry/Reverse/reducers.js b/js-old/src/dapps/registry/Reverse/reducers.js similarity index 100% rename from js/src/dapps/registry/Reverse/reducers.js rename to js-old/src/dapps/registry/Reverse/reducers.js diff --git a/js/src/dapps/registry/Reverse/reverse.css b/js-old/src/dapps/registry/Reverse/reverse.css similarity index 100% rename from js/src/dapps/registry/Reverse/reverse.css rename to js-old/src/dapps/registry/Reverse/reverse.css diff --git a/js/src/dapps/registry/Reverse/reverse.js b/js-old/src/dapps/registry/Reverse/reverse.js similarity index 100% rename from js/src/dapps/registry/Reverse/reverse.js rename to js-old/src/dapps/registry/Reverse/reverse.js diff --git a/js/src/dapps/registry/actions.js b/js-old/src/dapps/registry/actions.js similarity index 100% rename from js/src/dapps/registry/actions.js rename to js-old/src/dapps/registry/actions.js diff --git a/js/src/dapps/registry/addresses/accounts-reducer.js b/js-old/src/dapps/registry/addresses/accounts-reducer.js similarity index 100% rename from js/src/dapps/registry/addresses/accounts-reducer.js rename to js-old/src/dapps/registry/addresses/accounts-reducer.js diff --git a/js/src/dapps/registry/addresses/actions.js b/js-old/src/dapps/registry/addresses/actions.js similarity index 100% rename from js/src/dapps/registry/addresses/actions.js rename to js-old/src/dapps/registry/addresses/actions.js diff --git a/js/src/dapps/registry/addresses/contacts-reducer.js b/js-old/src/dapps/registry/addresses/contacts-reducer.js similarity index 100% rename from js/src/dapps/registry/addresses/contacts-reducer.js rename to js-old/src/dapps/registry/addresses/contacts-reducer.js diff --git a/js/src/dapps/registry/parity.js b/js-old/src/dapps/registry/parity.js similarity index 100% rename from js/src/dapps/registry/parity.js rename to js-old/src/dapps/registry/parity.js diff --git a/js/src/dapps/registry/reducers.js b/js-old/src/dapps/registry/reducers.js similarity index 100% rename from js/src/dapps/registry/reducers.js rename to js-old/src/dapps/registry/reducers.js diff --git a/js/src/dapps/registry/store.js b/js-old/src/dapps/registry/store.js similarity index 100% rename from js/src/dapps/registry/store.js rename to js-old/src/dapps/registry/store.js diff --git a/js/src/dapps/registry/ui/address.css b/js-old/src/dapps/registry/ui/address.css similarity index 100% rename from js/src/dapps/registry/ui/address.css rename to js-old/src/dapps/registry/ui/address.css diff --git a/js/src/dapps/registry/ui/address.js b/js-old/src/dapps/registry/ui/address.js similarity index 100% rename from js/src/dapps/registry/ui/address.js rename to js-old/src/dapps/registry/ui/address.js diff --git a/js/src/dapps/registry/ui/hash.css b/js-old/src/dapps/registry/ui/hash.css similarity index 100% rename from js/src/dapps/registry/ui/hash.css rename to js-old/src/dapps/registry/ui/hash.css diff --git a/js/src/dapps/registry/ui/hash.js b/js-old/src/dapps/registry/ui/hash.js similarity index 100% rename from js/src/dapps/registry/ui/hash.js rename to js-old/src/dapps/registry/ui/hash.js diff --git a/js/src/dapps/registry/ui/image.js b/js-old/src/dapps/registry/ui/image.js similarity index 100% rename from js/src/dapps/registry/ui/image.js rename to js-old/src/dapps/registry/ui/image.js diff --git a/js/src/dapps/registry/util/actions.js b/js-old/src/dapps/registry/util/actions.js similarity index 100% rename from js/src/dapps/registry/util/actions.js rename to js-old/src/dapps/registry/util/actions.js diff --git a/js/src/dapps/registry/util/etherscan-url.js b/js-old/src/dapps/registry/util/etherscan-url.js similarity index 100% rename from js/src/dapps/registry/util/etherscan-url.js rename to js-old/src/dapps/registry/util/etherscan-url.js diff --git a/js/src/dapps/registry/util/post-tx.js b/js-old/src/dapps/registry/util/post-tx.js similarity index 100% rename from js/src/dapps/registry/util/post-tx.js rename to js-old/src/dapps/registry/util/post-tx.js diff --git a/js/src/dapps/registry/util/registry.js b/js-old/src/dapps/registry/util/registry.js similarity index 100% rename from js/src/dapps/registry/util/registry.js rename to js-old/src/dapps/registry/util/registry.js diff --git a/js/src/dapps/signaturereg.js b/js-old/src/dapps/signaturereg.js similarity index 100% rename from js/src/dapps/signaturereg.js rename to js-old/src/dapps/signaturereg.js diff --git a/js/src/dapps/signaturereg/Application/application.css b/js-old/src/dapps/signaturereg/Application/application.css similarity index 100% rename from js/src/dapps/signaturereg/Application/application.css rename to js-old/src/dapps/signaturereg/Application/application.css diff --git a/js/src/dapps/signaturereg/Application/application.js b/js-old/src/dapps/signaturereg/Application/application.js similarity index 100% rename from js/src/dapps/signaturereg/Application/application.js rename to js-old/src/dapps/signaturereg/Application/application.js diff --git a/js/src/dapps/signaturereg/Application/index.js b/js-old/src/dapps/signaturereg/Application/index.js similarity index 100% rename from js/src/dapps/signaturereg/Application/index.js rename to js-old/src/dapps/signaturereg/Application/index.js diff --git a/js/src/dapps/signaturereg/Button/button.css b/js-old/src/dapps/signaturereg/Button/button.css similarity index 100% rename from js/src/dapps/signaturereg/Button/button.css rename to js-old/src/dapps/signaturereg/Button/button.css diff --git a/js/src/dapps/signaturereg/Button/button.js b/js-old/src/dapps/signaturereg/Button/button.js similarity index 100% rename from js/src/dapps/signaturereg/Button/button.js rename to js-old/src/dapps/signaturereg/Button/button.js diff --git a/js/src/dapps/signaturereg/Button/index.js b/js-old/src/dapps/signaturereg/Button/index.js similarity index 100% rename from js/src/dapps/signaturereg/Button/index.js rename to js-old/src/dapps/signaturereg/Button/index.js diff --git a/js/src/dapps/signaturereg/Events/events.css b/js-old/src/dapps/signaturereg/Events/events.css similarity index 100% rename from js/src/dapps/signaturereg/Events/events.css rename to js-old/src/dapps/signaturereg/Events/events.css diff --git a/js/src/dapps/signaturereg/Events/events.js b/js-old/src/dapps/signaturereg/Events/events.js similarity index 100% rename from js/src/dapps/signaturereg/Events/events.js rename to js-old/src/dapps/signaturereg/Events/events.js diff --git a/js/src/dapps/signaturereg/Events/index.js b/js-old/src/dapps/signaturereg/Events/index.js similarity index 100% rename from js/src/dapps/signaturereg/Events/index.js rename to js-old/src/dapps/signaturereg/Events/index.js diff --git a/js/src/dapps/signaturereg/Header/header.css b/js-old/src/dapps/signaturereg/Header/header.css similarity index 100% rename from js/src/dapps/signaturereg/Header/header.css rename to js-old/src/dapps/signaturereg/Header/header.css diff --git a/js/src/dapps/signaturereg/Header/header.js b/js-old/src/dapps/signaturereg/Header/header.js similarity index 100% rename from js/src/dapps/signaturereg/Header/header.js rename to js-old/src/dapps/signaturereg/Header/header.js diff --git a/js/src/dapps/signaturereg/Header/index.js b/js-old/src/dapps/signaturereg/Header/index.js similarity index 100% rename from js/src/dapps/signaturereg/Header/index.js rename to js-old/src/dapps/signaturereg/Header/index.js diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.css b/js-old/src/dapps/signaturereg/IdentityIcon/identityIcon.css similarity index 100% rename from js/src/dapps/signaturereg/IdentityIcon/identityIcon.css rename to js-old/src/dapps/signaturereg/IdentityIcon/identityIcon.css diff --git a/js/src/dapps/signaturereg/IdentityIcon/identityIcon.js b/js-old/src/dapps/signaturereg/IdentityIcon/identityIcon.js similarity index 100% rename from js/src/dapps/signaturereg/IdentityIcon/identityIcon.js rename to js-old/src/dapps/signaturereg/IdentityIcon/identityIcon.js diff --git a/js/src/dapps/signaturereg/IdentityIcon/index.js b/js-old/src/dapps/signaturereg/IdentityIcon/index.js similarity index 100% rename from js/src/dapps/signaturereg/IdentityIcon/index.js rename to js-old/src/dapps/signaturereg/IdentityIcon/index.js diff --git a/js/src/dapps/signaturereg/Import/import.css b/js-old/src/dapps/signaturereg/Import/import.css similarity index 100% rename from js/src/dapps/signaturereg/Import/import.css rename to js-old/src/dapps/signaturereg/Import/import.css diff --git a/js/src/dapps/signaturereg/Import/import.js b/js-old/src/dapps/signaturereg/Import/import.js similarity index 100% rename from js/src/dapps/signaturereg/Import/import.js rename to js-old/src/dapps/signaturereg/Import/import.js diff --git a/js/src/dapps/signaturereg/Import/index.js b/js-old/src/dapps/signaturereg/Import/index.js similarity index 100% rename from js/src/dapps/signaturereg/Import/index.js rename to js-old/src/dapps/signaturereg/Import/index.js diff --git a/js/src/dapps/signaturereg/Loading/index.js b/js-old/src/dapps/signaturereg/Loading/index.js similarity index 100% rename from js/src/dapps/signaturereg/Loading/index.js rename to js-old/src/dapps/signaturereg/Loading/index.js diff --git a/js/src/dapps/signaturereg/Loading/loading.css b/js-old/src/dapps/signaturereg/Loading/loading.css similarity index 100% rename from js/src/dapps/signaturereg/Loading/loading.css rename to js-old/src/dapps/signaturereg/Loading/loading.css diff --git a/js/src/dapps/signaturereg/Loading/loading.js b/js-old/src/dapps/signaturereg/Loading/loading.js similarity index 100% rename from js/src/dapps/signaturereg/Loading/loading.js rename to js-old/src/dapps/signaturereg/Loading/loading.js diff --git a/js/src/dapps/signaturereg/format.js b/js-old/src/dapps/signaturereg/format.js similarity index 100% rename from js/src/dapps/signaturereg/format.js rename to js-old/src/dapps/signaturereg/format.js diff --git a/js/src/dapps/signaturereg/parity.js b/js-old/src/dapps/signaturereg/parity.js similarity index 100% rename from js/src/dapps/signaturereg/parity.js rename to js-old/src/dapps/signaturereg/parity.js diff --git a/js/src/dapps/signaturereg/services.js b/js-old/src/dapps/signaturereg/services.js similarity index 100% rename from js/src/dapps/signaturereg/services.js rename to js-old/src/dapps/signaturereg/services.js diff --git a/js/src/dapps/static/.gitkeep b/js-old/src/dapps/static/.gitkeep similarity index 100% rename from js/src/dapps/static/.gitkeep rename to js-old/src/dapps/static/.gitkeep diff --git a/js/src/dapps/style.css b/js-old/src/dapps/style.css similarity index 100% rename from js/src/dapps/style.css rename to js-old/src/dapps/style.css diff --git a/js/src/dapps/tokendeploy.js b/js-old/src/dapps/tokendeploy.js similarity index 100% rename from js/src/dapps/tokendeploy.js rename to js-old/src/dapps/tokendeploy.js diff --git a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.css b/js-old/src/dapps/tokendeploy/AddressSelect/addressSelect.css similarity index 100% rename from js/src/dapps/tokendeploy/AddressSelect/addressSelect.css rename to js-old/src/dapps/tokendeploy/AddressSelect/addressSelect.css diff --git a/js/src/dapps/tokendeploy/AddressSelect/addressSelect.js b/js-old/src/dapps/tokendeploy/AddressSelect/addressSelect.js similarity index 100% rename from js/src/dapps/tokendeploy/AddressSelect/addressSelect.js rename to js-old/src/dapps/tokendeploy/AddressSelect/addressSelect.js diff --git a/js/src/dapps/tokendeploy/AddressSelect/index.js b/js-old/src/dapps/tokendeploy/AddressSelect/index.js similarity index 100% rename from js/src/dapps/tokendeploy/AddressSelect/index.js rename to js-old/src/dapps/tokendeploy/AddressSelect/index.js diff --git a/js/src/dapps/tokendeploy/Application/Header/header.css b/js-old/src/dapps/tokendeploy/Application/Header/header.css similarity index 100% rename from js/src/dapps/tokendeploy/Application/Header/header.css rename to js-old/src/dapps/tokendeploy/Application/Header/header.css diff --git a/js/src/dapps/tokendeploy/Application/Header/header.js b/js-old/src/dapps/tokendeploy/Application/Header/header.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/Header/header.js rename to js-old/src/dapps/tokendeploy/Application/Header/header.js diff --git a/js/src/dapps/tokendeploy/Application/Header/index.js b/js-old/src/dapps/tokendeploy/Application/Header/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/Header/index.js rename to js-old/src/dapps/tokendeploy/Application/Header/index.js diff --git a/js/src/dapps/tokendeploy/Application/Loading/index.js b/js-old/src/dapps/tokendeploy/Application/Loading/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/Loading/index.js rename to js-old/src/dapps/tokendeploy/Application/Loading/index.js diff --git a/js/src/dapps/tokendeploy/Application/Loading/loading.css b/js-old/src/dapps/tokendeploy/Application/Loading/loading.css similarity index 100% rename from js/src/dapps/tokendeploy/Application/Loading/loading.css rename to js-old/src/dapps/tokendeploy/Application/Loading/loading.css diff --git a/js/src/dapps/tokendeploy/Application/Loading/loading.js b/js-old/src/dapps/tokendeploy/Application/Loading/loading.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/Loading/loading.js rename to js-old/src/dapps/tokendeploy/Application/Loading/loading.js diff --git a/js/src/dapps/tokendeploy/Application/application.css b/js-old/src/dapps/tokendeploy/Application/application.css similarity index 100% rename from js/src/dapps/tokendeploy/Application/application.css rename to js-old/src/dapps/tokendeploy/Application/application.css diff --git a/js/src/dapps/tokendeploy/Application/application.js b/js-old/src/dapps/tokendeploy/Application/application.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/application.js rename to js-old/src/dapps/tokendeploy/Application/application.js diff --git a/js/src/dapps/tokendeploy/Application/index.js b/js-old/src/dapps/tokendeploy/Application/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/index.js rename to js-old/src/dapps/tokendeploy/Application/index.js diff --git a/js/src/dapps/tokendeploy/Application/pages.js b/js-old/src/dapps/tokendeploy/Application/pages.js similarity index 100% rename from js/src/dapps/tokendeploy/Application/pages.js rename to js-old/src/dapps/tokendeploy/Application/pages.js diff --git a/js/src/dapps/tokendeploy/Container/container.css b/js-old/src/dapps/tokendeploy/Container/container.css similarity index 100% rename from js/src/dapps/tokendeploy/Container/container.css rename to js-old/src/dapps/tokendeploy/Container/container.css diff --git a/js/src/dapps/tokendeploy/Container/container.js b/js-old/src/dapps/tokendeploy/Container/container.js similarity index 100% rename from js/src/dapps/tokendeploy/Container/container.js rename to js-old/src/dapps/tokendeploy/Container/container.js diff --git a/js/src/dapps/tokendeploy/Container/index.js b/js-old/src/dapps/tokendeploy/Container/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Container/index.js rename to js-old/src/dapps/tokendeploy/Container/index.js diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.css b/js-old/src/dapps/tokendeploy/Deploy/Deployment/deployment.css similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Deployment/deployment.css rename to js-old/src/dapps/tokendeploy/Deploy/Deployment/deployment.css diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js b/js-old/src/dapps/tokendeploy/Deploy/Deployment/deployment.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Deployment/deployment.js rename to js-old/src/dapps/tokendeploy/Deploy/Deployment/deployment.js diff --git a/js/src/dapps/tokendeploy/Deploy/Deployment/index.js b/js-old/src/dapps/tokendeploy/Deploy/Deployment/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Deployment/index.js rename to js-old/src/dapps/tokendeploy/Deploy/Deployment/index.js diff --git a/js/src/dapps/tokendeploy/Deploy/Event/event.css b/js-old/src/dapps/tokendeploy/Deploy/Event/event.css similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Event/event.css rename to js-old/src/dapps/tokendeploy/Deploy/Event/event.css diff --git a/js/src/dapps/tokendeploy/Deploy/Event/event.js b/js-old/src/dapps/tokendeploy/Deploy/Event/event.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Event/event.js rename to js-old/src/dapps/tokendeploy/Deploy/Event/event.js diff --git a/js/src/dapps/tokendeploy/Deploy/Event/index.js b/js-old/src/dapps/tokendeploy/Deploy/Event/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Event/index.js rename to js-old/src/dapps/tokendeploy/Deploy/Event/index.js diff --git a/js/src/dapps/tokendeploy/Deploy/Events/events.css b/js-old/src/dapps/tokendeploy/Deploy/Events/events.css similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Events/events.css rename to js-old/src/dapps/tokendeploy/Deploy/Events/events.css diff --git a/js/src/dapps/tokendeploy/Deploy/Events/events.js b/js-old/src/dapps/tokendeploy/Deploy/Events/events.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Events/events.js rename to js-old/src/dapps/tokendeploy/Deploy/Events/events.js diff --git a/js/src/dapps/tokendeploy/Deploy/Events/index.js b/js-old/src/dapps/tokendeploy/Deploy/Events/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/Events/index.js rename to js-old/src/dapps/tokendeploy/Deploy/Events/index.js diff --git a/js/src/dapps/tokendeploy/Deploy/deploy.js b/js-old/src/dapps/tokendeploy/Deploy/deploy.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/deploy.js rename to js-old/src/dapps/tokendeploy/Deploy/deploy.js diff --git a/js/src/dapps/tokendeploy/Deploy/index.js b/js-old/src/dapps/tokendeploy/Deploy/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Deploy/index.js rename to js-old/src/dapps/tokendeploy/Deploy/index.js diff --git a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.css b/js-old/src/dapps/tokendeploy/IdentityIcon/identityIcon.css similarity index 100% rename from js/src/dapps/tokendeploy/IdentityIcon/identityIcon.css rename to js-old/src/dapps/tokendeploy/IdentityIcon/identityIcon.css diff --git a/js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js b/js-old/src/dapps/tokendeploy/IdentityIcon/identityIcon.js similarity index 100% rename from js/src/dapps/tokendeploy/IdentityIcon/identityIcon.js rename to js-old/src/dapps/tokendeploy/IdentityIcon/identityIcon.js diff --git a/js/src/dapps/tokendeploy/IdentityIcon/index.js b/js-old/src/dapps/tokendeploy/IdentityIcon/index.js similarity index 100% rename from js/src/dapps/tokendeploy/IdentityIcon/index.js rename to js-old/src/dapps/tokendeploy/IdentityIcon/index.js diff --git a/js/src/dapps/tokendeploy/Overview/Owner/index.js b/js-old/src/dapps/tokendeploy/Overview/Owner/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Overview/Owner/index.js rename to js-old/src/dapps/tokendeploy/Overview/Owner/index.js diff --git a/js/src/dapps/tokendeploy/Overview/Owner/owner.css b/js-old/src/dapps/tokendeploy/Overview/Owner/owner.css similarity index 100% rename from js/src/dapps/tokendeploy/Overview/Owner/owner.css rename to js-old/src/dapps/tokendeploy/Overview/Owner/owner.css diff --git a/js/src/dapps/tokendeploy/Overview/Owner/owner.js b/js-old/src/dapps/tokendeploy/Overview/Owner/owner.js similarity index 100% rename from js/src/dapps/tokendeploy/Overview/Owner/owner.js rename to js-old/src/dapps/tokendeploy/Overview/Owner/owner.js diff --git a/js/src/dapps/tokendeploy/Overview/Token/index.js b/js-old/src/dapps/tokendeploy/Overview/Token/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Overview/Token/index.js rename to js-old/src/dapps/tokendeploy/Overview/Token/index.js diff --git a/js/src/dapps/tokendeploy/Overview/Token/token.css b/js-old/src/dapps/tokendeploy/Overview/Token/token.css similarity index 100% rename from js/src/dapps/tokendeploy/Overview/Token/token.css rename to js-old/src/dapps/tokendeploy/Overview/Token/token.css diff --git a/js/src/dapps/tokendeploy/Overview/Token/token.js b/js-old/src/dapps/tokendeploy/Overview/Token/token.js similarity index 100% rename from js/src/dapps/tokendeploy/Overview/Token/token.js rename to js-old/src/dapps/tokendeploy/Overview/Token/token.js diff --git a/js/src/dapps/tokendeploy/Overview/index.js b/js-old/src/dapps/tokendeploy/Overview/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Overview/index.js rename to js-old/src/dapps/tokendeploy/Overview/index.js diff --git a/js/src/dapps/tokendeploy/Overview/overview.css b/js-old/src/dapps/tokendeploy/Overview/overview.css similarity index 100% rename from js/src/dapps/tokendeploy/Overview/overview.css rename to js-old/src/dapps/tokendeploy/Overview/overview.css diff --git a/js/src/dapps/tokendeploy/Overview/overview.js b/js-old/src/dapps/tokendeploy/Overview/overview.js similarity index 100% rename from js/src/dapps/tokendeploy/Overview/overview.js rename to js-old/src/dapps/tokendeploy/Overview/overview.js diff --git a/js/src/dapps/tokendeploy/Transfer/Event/event.js b/js-old/src/dapps/tokendeploy/Transfer/Event/event.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Event/event.js rename to js-old/src/dapps/tokendeploy/Transfer/Event/event.js diff --git a/js/src/dapps/tokendeploy/Transfer/Event/index.js b/js-old/src/dapps/tokendeploy/Transfer/Event/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Event/index.js rename to js-old/src/dapps/tokendeploy/Transfer/Event/index.js diff --git a/js/src/dapps/tokendeploy/Transfer/Events/events.js b/js-old/src/dapps/tokendeploy/Transfer/Events/events.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Events/events.js rename to js-old/src/dapps/tokendeploy/Transfer/Events/events.js diff --git a/js/src/dapps/tokendeploy/Transfer/Events/index.js b/js-old/src/dapps/tokendeploy/Transfer/Events/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Events/index.js rename to js-old/src/dapps/tokendeploy/Transfer/Events/index.js diff --git a/js/src/dapps/tokendeploy/Transfer/Send/index.js b/js-old/src/dapps/tokendeploy/Transfer/Send/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Send/index.js rename to js-old/src/dapps/tokendeploy/Transfer/Send/index.js diff --git a/js/src/dapps/tokendeploy/Transfer/Send/send.css b/js-old/src/dapps/tokendeploy/Transfer/Send/send.css similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Send/send.css rename to js-old/src/dapps/tokendeploy/Transfer/Send/send.css diff --git a/js/src/dapps/tokendeploy/Transfer/Send/send.js b/js-old/src/dapps/tokendeploy/Transfer/Send/send.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/Send/send.js rename to js-old/src/dapps/tokendeploy/Transfer/Send/send.js diff --git a/js/src/dapps/tokendeploy/Transfer/index.js b/js-old/src/dapps/tokendeploy/Transfer/index.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/index.js rename to js-old/src/dapps/tokendeploy/Transfer/index.js diff --git a/js/src/dapps/tokendeploy/Transfer/transfer.js b/js-old/src/dapps/tokendeploy/Transfer/transfer.js similarity index 100% rename from js/src/dapps/tokendeploy/Transfer/transfer.js rename to js-old/src/dapps/tokendeploy/Transfer/transfer.js diff --git a/js/src/dapps/tokendeploy/_form.css b/js-old/src/dapps/tokendeploy/_form.css similarity index 100% rename from js/src/dapps/tokendeploy/_form.css rename to js-old/src/dapps/tokendeploy/_form.css diff --git a/js/src/dapps/tokendeploy/_status.css b/js-old/src/dapps/tokendeploy/_status.css similarity index 100% rename from js/src/dapps/tokendeploy/_status.css rename to js-old/src/dapps/tokendeploy/_status.css diff --git a/js/src/dapps/tokendeploy/background.jpg b/js-old/src/dapps/tokendeploy/background.jpg similarity index 100% rename from js/src/dapps/tokendeploy/background.jpg rename to js-old/src/dapps/tokendeploy/background.jpg diff --git a/js/src/dapps/tokendeploy/parity.js b/js-old/src/dapps/tokendeploy/parity.js similarity index 100% rename from js/src/dapps/tokendeploy/parity.js rename to js-old/src/dapps/tokendeploy/parity.js diff --git a/js/src/dapps/tokendeploy/services.js b/js-old/src/dapps/tokendeploy/services.js similarity index 100% rename from js/src/dapps/tokendeploy/services.js rename to js-old/src/dapps/tokendeploy/services.js diff --git a/js/src/dapps/tokenreg.js b/js-old/src/dapps/tokenreg.js similarity index 100% rename from js/src/dapps/tokenreg.js rename to js-old/src/dapps/tokenreg.js diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css b/js-old/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css similarity index 100% rename from js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css rename to js-old/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.css diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js b/js-old/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js similarity index 100% rename from js/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js rename to js-old/src/dapps/tokenreg/Accounts/AccountSelector/account-selector.js diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/container.js b/js-old/src/dapps/tokenreg/Accounts/AccountSelector/container.js similarity index 100% rename from js/src/dapps/tokenreg/Accounts/AccountSelector/container.js rename to js-old/src/dapps/tokenreg/Accounts/AccountSelector/container.js diff --git a/js/src/dapps/tokenreg/Accounts/AccountSelector/index.js b/js-old/src/dapps/tokenreg/Accounts/AccountSelector/index.js similarity index 100% rename from js/src/dapps/tokenreg/Accounts/AccountSelector/index.js rename to js-old/src/dapps/tokenreg/Accounts/AccountSelector/index.js diff --git a/js/src/dapps/tokenreg/Accounts/actions.js b/js-old/src/dapps/tokenreg/Accounts/actions.js similarity index 100% rename from js/src/dapps/tokenreg/Accounts/actions.js rename to js-old/src/dapps/tokenreg/Accounts/actions.js diff --git a/js/src/dapps/tokenreg/Accounts/reducer.js b/js-old/src/dapps/tokenreg/Accounts/reducer.js similarity index 100% rename from js/src/dapps/tokenreg/Accounts/reducer.js rename to js-old/src/dapps/tokenreg/Accounts/reducer.js diff --git a/js/src/dapps/tokenreg/Actions/Query/index.js b/js-old/src/dapps/tokenreg/Actions/Query/index.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/Query/index.js rename to js-old/src/dapps/tokenreg/Actions/Query/index.js diff --git a/js/src/dapps/tokenreg/Actions/Query/query.js b/js-old/src/dapps/tokenreg/Actions/Query/query.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/Query/query.js rename to js-old/src/dapps/tokenreg/Actions/Query/query.js diff --git a/js/src/dapps/tokenreg/Actions/Register/index.js b/js-old/src/dapps/tokenreg/Actions/Register/index.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/Register/index.js rename to js-old/src/dapps/tokenreg/Actions/Register/index.js diff --git a/js/src/dapps/tokenreg/Actions/Register/register.js b/js-old/src/dapps/tokenreg/Actions/Register/register.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/Register/register.js rename to js-old/src/dapps/tokenreg/Actions/Register/register.js diff --git a/js/src/dapps/tokenreg/Actions/actions.css b/js-old/src/dapps/tokenreg/Actions/actions.css similarity index 100% rename from js/src/dapps/tokenreg/Actions/actions.css rename to js-old/src/dapps/tokenreg/Actions/actions.css diff --git a/js/src/dapps/tokenreg/Actions/actions.js b/js-old/src/dapps/tokenreg/Actions/actions.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/actions.js rename to js-old/src/dapps/tokenreg/Actions/actions.js diff --git a/js/src/dapps/tokenreg/Actions/component.js b/js-old/src/dapps/tokenreg/Actions/component.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/component.js rename to js-old/src/dapps/tokenreg/Actions/component.js diff --git a/js/src/dapps/tokenreg/Actions/container.js b/js-old/src/dapps/tokenreg/Actions/container.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/container.js rename to js-old/src/dapps/tokenreg/Actions/container.js diff --git a/js/src/dapps/tokenreg/Actions/index.js b/js-old/src/dapps/tokenreg/Actions/index.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/index.js rename to js-old/src/dapps/tokenreg/Actions/index.js diff --git a/js/src/dapps/tokenreg/Actions/reducer.js b/js-old/src/dapps/tokenreg/Actions/reducer.js similarity index 100% rename from js/src/dapps/tokenreg/Actions/reducer.js rename to js-old/src/dapps/tokenreg/Actions/reducer.js diff --git a/js/src/dapps/tokenreg/Application/application.css b/js-old/src/dapps/tokenreg/Application/application.css similarity index 98% rename from js/src/dapps/tokenreg/Application/application.css rename to js-old/src/dapps/tokenreg/Application/application.css index d855b6388a04b80d9ce359daa193ac2b6f1dfa09..b1eef22e45b3977c440165568b1dfe3c476c7558 100644 --- a/js/src/dapps/tokenreg/Application/application.css +++ b/js-old/src/dapps/tokenreg/Application/application.css @@ -29,7 +29,6 @@ left: 0; opacity: 1; padding: 1.5em; - cursor: pointer; position: fixed; right: 50%; z-index: 100; diff --git a/js/src/dapps/tokenreg/Application/application.js b/js-old/src/dapps/tokenreg/Application/application.js similarity index 73% rename from js/src/dapps/tokenreg/Application/application.js rename to js-old/src/dapps/tokenreg/Application/application.js index df4a53ff102b32ddb57406b2a1694808058d013e..71081c7ee57a3a15d7a19d09dce8dc58c626b3f0 100644 --- a/js/src/dapps/tokenreg/Application/application.js +++ b/js-old/src/dapps/tokenreg/Application/application.js @@ -43,13 +43,8 @@ export default class Application extends Component { contract: PropTypes.object }; - state = { - hideWarning: false - }; - render () { const { isLoading, contract } = this.props; - const { hideWarning } = this.state; if (isLoading) { return ( @@ -67,15 +62,9 @@ export default class Application extends Component { - { - hideWarning - ? null - : ( -
- WARNING: The token registry is experimental. Please ensure that you understand the steps, risks, benefits & consequences of registering a token before doing so. A non-refundable fee of { api.util.fromWei(contract.fee).toFormat(3) }ETH is required for all registrations. -
- ) - } +
+ WARNING: The token registry is experimental. Please ensure that you understand the steps, risks, benefits & consequences of registering a token before doing so. A non-refundable fee of { api.util.fromWei(contract.fee).toFormat(3) }ETH is required for all registrations. +
); } @@ -85,8 +74,4 @@ export default class Application extends Component { muiTheme }; } - - handleHideWarning = () => { - this.setState({ hideWarning: true }); - } } diff --git a/js/src/dapps/tokenreg/Application/index.js b/js-old/src/dapps/tokenreg/Application/index.js similarity index 100% rename from js/src/dapps/tokenreg/Application/index.js rename to js-old/src/dapps/tokenreg/Application/index.js diff --git a/js/src/dapps/tokenreg/Chip/chip.css b/js-old/src/dapps/tokenreg/Chip/chip.css similarity index 100% rename from js/src/dapps/tokenreg/Chip/chip.css rename to js-old/src/dapps/tokenreg/Chip/chip.css diff --git a/js/src/dapps/tokenreg/Chip/chip.js b/js-old/src/dapps/tokenreg/Chip/chip.js similarity index 100% rename from js/src/dapps/tokenreg/Chip/chip.js rename to js-old/src/dapps/tokenreg/Chip/chip.js diff --git a/js/src/dapps/tokenreg/Chip/index.js b/js-old/src/dapps/tokenreg/Chip/index.js similarity index 100% rename from js/src/dapps/tokenreg/Chip/index.js rename to js-old/src/dapps/tokenreg/Chip/index.js diff --git a/js/src/dapps/tokenreg/Container.js b/js-old/src/dapps/tokenreg/Container.js similarity index 100% rename from js/src/dapps/tokenreg/Container.js rename to js-old/src/dapps/tokenreg/Container.js diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.css b/js-old/src/dapps/tokenreg/IdentityIcon/identityIcon.css similarity index 100% rename from js/src/dapps/tokenreg/IdentityIcon/identityIcon.css rename to js-old/src/dapps/tokenreg/IdentityIcon/identityIcon.css diff --git a/js/src/dapps/tokenreg/IdentityIcon/identityIcon.js b/js-old/src/dapps/tokenreg/IdentityIcon/identityIcon.js similarity index 100% rename from js/src/dapps/tokenreg/IdentityIcon/identityIcon.js rename to js-old/src/dapps/tokenreg/IdentityIcon/identityIcon.js diff --git a/js/src/dapps/tokenreg/IdentityIcon/index.js b/js-old/src/dapps/tokenreg/IdentityIcon/index.js similarity index 100% rename from js/src/dapps/tokenreg/IdentityIcon/index.js rename to js-old/src/dapps/tokenreg/IdentityIcon/index.js diff --git a/js/src/dapps/tokenreg/Inputs/Text/container.js b/js-old/src/dapps/tokenreg/Inputs/Text/container.js similarity index 100% rename from js/src/dapps/tokenreg/Inputs/Text/container.js rename to js-old/src/dapps/tokenreg/Inputs/Text/container.js diff --git a/js/src/dapps/tokenreg/Inputs/Text/index.js b/js-old/src/dapps/tokenreg/Inputs/Text/index.js similarity index 100% rename from js/src/dapps/tokenreg/Inputs/Text/index.js rename to js-old/src/dapps/tokenreg/Inputs/Text/index.js diff --git a/js/src/dapps/tokenreg/Inputs/Text/input-text.js b/js-old/src/dapps/tokenreg/Inputs/Text/input-text.js similarity index 100% rename from js/src/dapps/tokenreg/Inputs/Text/input-text.js rename to js-old/src/dapps/tokenreg/Inputs/Text/input-text.js diff --git a/js/src/dapps/tokenreg/Inputs/inputs.css b/js-old/src/dapps/tokenreg/Inputs/inputs.css similarity index 100% rename from js/src/dapps/tokenreg/Inputs/inputs.css rename to js-old/src/dapps/tokenreg/Inputs/inputs.css diff --git a/js/src/dapps/tokenreg/Inputs/validation.js b/js-old/src/dapps/tokenreg/Inputs/validation.js similarity index 100% rename from js/src/dapps/tokenreg/Inputs/validation.js rename to js-old/src/dapps/tokenreg/Inputs/validation.js diff --git a/js/src/dapps/tokenreg/Loading/index.js b/js-old/src/dapps/tokenreg/Loading/index.js similarity index 100% rename from js/src/dapps/tokenreg/Loading/index.js rename to js-old/src/dapps/tokenreg/Loading/index.js diff --git a/js/src/dapps/tokenreg/Loading/loading.css b/js-old/src/dapps/tokenreg/Loading/loading.css similarity index 100% rename from js/src/dapps/tokenreg/Loading/loading.css rename to js-old/src/dapps/tokenreg/Loading/loading.css diff --git a/js/src/dapps/tokenreg/Loading/loading.js b/js-old/src/dapps/tokenreg/Loading/loading.js similarity index 100% rename from js/src/dapps/tokenreg/Loading/loading.js rename to js-old/src/dapps/tokenreg/Loading/loading.js diff --git a/js/src/dapps/tokenreg/Status/actions.js b/js-old/src/dapps/tokenreg/Status/actions.js similarity index 100% rename from js/src/dapps/tokenreg/Status/actions.js rename to js-old/src/dapps/tokenreg/Status/actions.js diff --git a/js/src/dapps/tokenreg/Status/index.js b/js-old/src/dapps/tokenreg/Status/index.js similarity index 100% rename from js/src/dapps/tokenreg/Status/index.js rename to js-old/src/dapps/tokenreg/Status/index.js diff --git a/js/src/dapps/tokenreg/Status/reducer.js b/js-old/src/dapps/tokenreg/Status/reducer.js similarity index 100% rename from js/src/dapps/tokenreg/Status/reducer.js rename to js-old/src/dapps/tokenreg/Status/reducer.js diff --git a/js/src/dapps/tokenreg/Status/status.css b/js-old/src/dapps/tokenreg/Status/status.css similarity index 100% rename from js/src/dapps/tokenreg/Status/status.css rename to js-old/src/dapps/tokenreg/Status/status.css diff --git a/js/src/dapps/tokenreg/Status/status.js b/js-old/src/dapps/tokenreg/Status/status.js similarity index 100% rename from js/src/dapps/tokenreg/Status/status.js rename to js-old/src/dapps/tokenreg/Status/status.js diff --git a/js/src/dapps/tokenreg/Tokens/Token/add-meta.js b/js-old/src/dapps/tokenreg/Tokens/Token/add-meta.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/Token/add-meta.js rename to js-old/src/dapps/tokenreg/Tokens/Token/add-meta.js diff --git a/js/src/dapps/tokenreg/Tokens/Token/index.js b/js-old/src/dapps/tokenreg/Tokens/Token/index.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/Token/index.js rename to js-old/src/dapps/tokenreg/Tokens/Token/index.js diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.css b/js-old/src/dapps/tokenreg/Tokens/Token/token.css similarity index 100% rename from js/src/dapps/tokenreg/Tokens/Token/token.css rename to js-old/src/dapps/tokenreg/Tokens/Token/token.css diff --git a/js/src/dapps/tokenreg/Tokens/Token/token.js b/js-old/src/dapps/tokenreg/Tokens/Token/token.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/Token/token.js rename to js-old/src/dapps/tokenreg/Tokens/Token/token.js diff --git a/js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js b/js-old/src/dapps/tokenreg/Tokens/Token/tokenContainer.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/Token/tokenContainer.js rename to js-old/src/dapps/tokenreg/Tokens/Token/tokenContainer.js diff --git a/js/src/dapps/tokenreg/Tokens/actions.js b/js-old/src/dapps/tokenreg/Tokens/actions.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/actions.js rename to js-old/src/dapps/tokenreg/Tokens/actions.js diff --git a/js/src/dapps/tokenreg/Tokens/container.js b/js-old/src/dapps/tokenreg/Tokens/container.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/container.js rename to js-old/src/dapps/tokenreg/Tokens/container.js diff --git a/js/src/dapps/tokenreg/Tokens/index.js b/js-old/src/dapps/tokenreg/Tokens/index.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/index.js rename to js-old/src/dapps/tokenreg/Tokens/index.js diff --git a/js/src/dapps/tokenreg/Tokens/reducer.js b/js-old/src/dapps/tokenreg/Tokens/reducer.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/reducer.js rename to js-old/src/dapps/tokenreg/Tokens/reducer.js diff --git a/js/src/dapps/tokenreg/Tokens/tokens.css b/js-old/src/dapps/tokenreg/Tokens/tokens.css similarity index 100% rename from js/src/dapps/tokenreg/Tokens/tokens.css rename to js-old/src/dapps/tokenreg/Tokens/tokens.css diff --git a/js/src/dapps/tokenreg/Tokens/tokens.js b/js-old/src/dapps/tokenreg/Tokens/tokens.js similarity index 100% rename from js/src/dapps/tokenreg/Tokens/tokens.js rename to js-old/src/dapps/tokenreg/Tokens/tokens.js diff --git a/js/src/dapps/tokenreg/constants.js b/js-old/src/dapps/tokenreg/constants.js similarity index 100% rename from js/src/dapps/tokenreg/constants.js rename to js-old/src/dapps/tokenreg/constants.js diff --git a/js/src/dapps/tokenreg/parity.js b/js-old/src/dapps/tokenreg/parity.js similarity index 100% rename from js/src/dapps/tokenreg/parity.js rename to js-old/src/dapps/tokenreg/parity.js diff --git a/js/src/dapps/tokenreg/reducers.js b/js-old/src/dapps/tokenreg/reducers.js similarity index 100% rename from js/src/dapps/tokenreg/reducers.js rename to js-old/src/dapps/tokenreg/reducers.js diff --git a/js/src/dapps/tokenreg/store.js b/js-old/src/dapps/tokenreg/store.js similarity index 100% rename from js/src/dapps/tokenreg/store.js rename to js-old/src/dapps/tokenreg/store.js diff --git a/js/src/dapps/tokenreg/utils.js b/js-old/src/dapps/tokenreg/utils.js similarity index 100% rename from js/src/dapps/tokenreg/utils.js rename to js-old/src/dapps/tokenreg/utils.js diff --git a/js-old/src/dev.parity.html b/js-old/src/dev.parity.html new file mode 100644 index 0000000000000000000000000000000000000000..504dfbb7079d4a2f4ccbde46b021b7b5e2a8040a --- /dev/null +++ b/js-old/src/dev.parity.html @@ -0,0 +1,36 @@ + + + + + + + + dev::Parity.js + + + + +
+ best block #unknown +
+ + + diff --git a/js-old/src/dev.web3.html b/js-old/src/dev.web3.html new file mode 100644 index 0000000000000000000000000000000000000000..f4006160a039d192e0083ef83a5edc0c88998343 --- /dev/null +++ b/js-old/src/dev.web3.html @@ -0,0 +1,38 @@ + + + + + + + + dev::Web3 + + + + +
+ best block #unknown +
+ + + diff --git a/js-old/src/embed.js b/js-old/src/embed.js new file mode 100644 index 0000000000000000000000000000000000000000..0413fb4663bc942f17f1979c4a634ae046d0cef2 --- /dev/null +++ b/js-old/src/embed.js @@ -0,0 +1,132 @@ +// 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 . + +import 'whatwg-fetch'; + +import es6Promise from 'es6-promise'; +es6Promise.polyfill(); + +import React from 'react'; +import ReactDOM from 'react-dom'; +import { AppContainer } from 'react-hot-loader'; + +import injectTapEventPlugin from 'react-tap-event-plugin'; + +import SecureApi from '~/secureApi'; +import ContractInstances from '~/contracts'; + +import { initStore } from '~/redux'; +import ContextProvider from '~/ui/ContextProvider'; +import muiTheme from '~/ui/Theme'; + +import { patchApi } from '~/util/tx'; +import { setApi } from '~/redux/providers/apiActions'; + +import '~/environment'; + +import '../assets/fonts/Roboto/font.css'; +import '../assets/fonts/RobotoMono/font.css'; + +injectTapEventPlugin(); + +import ParityBar from '~/views/ParityBar'; + +// Test transport (std transport should be provided as global object) +class FakeTransport { + constructor () { + console.warn('Secure Transport not provided. Falling back to FakeTransport'); + } + + execute (method, ...params) { + console.log('Calling', method, params); + return Promise.reject('not connected'); + } + + addMiddleware () { + } + + on () { + } +} + +class FrameSecureApi extends SecureApi { + constructor (transport) { + super( + transport.uiUrl, + null, + () => transport, + () => 'http:' + ); + } + + connect () { + // Do nothing - this API does not need connecting + this.emit('connecting'); + // Fetch settings + this._fetchSettings(); + // Fire connected event with some delay. + setTimeout(() => { + this.emit('connected'); + }); + } + + needsToken () { + return false; + } + + isConnecting () { + return false; + } + + isConnected () { + return true; + } +} + +const transport = window.secureTransport || new FakeTransport(); +const uiUrl = transport.uiUrl || 'http://127.0.0.1:8180'; + +transport.uiUrlWithProtocol = uiUrl; +transport.uiUrl = uiUrl.replace('http://', '').replace('https://', ''); +const api = new FrameSecureApi(transport); + +patchApi(api); +ContractInstances.create(api); + +const store = initStore(api, null, true); + +store.dispatch({ type: 'initAll', api }); +store.dispatch(setApi(api)); + +window.secureApi = api; + +const app = ( + +); +const container = document.querySelector('#container'); + +ReactDOM.render( + + + { app } + + , + container +); diff --git a/js/src/environment/empty.js b/js-old/src/environment/empty.js similarity index 100% rename from js/src/environment/empty.js rename to js-old/src/environment/empty.js diff --git a/js/src/environment/index.js b/js-old/src/environment/index.js similarity index 100% rename from js/src/environment/index.js rename to js-old/src/environment/index.js diff --git a/js/src/environment/integration-tests/fake-backend.js b/js-old/src/environment/integration-tests/fake-backend.js similarity index 100% rename from js/src/environment/integration-tests/fake-backend.js rename to js-old/src/environment/integration-tests/fake-backend.js diff --git a/js/src/environment/integration-tests/index.js b/js-old/src/environment/integration-tests/index.js similarity index 100% rename from js/src/environment/integration-tests/index.js rename to js-old/src/environment/integration-tests/index.js diff --git a/js/src/environment/perf-debug/index.js b/js-old/src/environment/perf-debug/index.js similarity index 100% rename from js/src/environment/perf-debug/index.js rename to js-old/src/environment/perf-debug/index.js diff --git a/js/src/environment/perf-debug/why-update.js b/js-old/src/environment/perf-debug/why-update.js similarity index 100% rename from js/src/environment/perf-debug/why-update.js rename to js-old/src/environment/perf-debug/why-update.js diff --git a/js/src/environment/tests/index.js b/js-old/src/environment/tests/index.js similarity index 100% rename from js/src/environment/tests/index.js rename to js-old/src/environment/tests/index.js diff --git a/js/src/environment/tests/test-utils.js b/js-old/src/environment/tests/test-utils.js similarity index 100% rename from js/src/environment/tests/test-utils.js rename to js-old/src/environment/tests/test-utils.js diff --git a/js-old/src/error_pages.css b/js-old/src/error_pages.css new file mode 100644 index 0000000000000000000000000000000000000000..305f9caaadc7229e2730237a8fee9d81ebe710e5 --- /dev/null +++ b/js-old/src/error_pages.css @@ -0,0 +1,113 @@ +/* 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 . +*/ + +@font-face { + font-family: "Roboto"; + src: url('~roboto-font/fonts/Roboto/roboto-light-webfont.eot'); + src: url('~roboto-font/fonts/Roboto/roboto-light-webfont.eot?#iefix') format('embedded-opentype'), url('~roboto-font/fonts/Roboto/roboto-light-webfont.woff') format('woff'), url('~roboto-font/fonts/Roboto/roboto-light-webfont.ttf') format('truetype'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'Roboto Mono'; + src: url('~roboto-mono-webfont/fonts/RobotoMono-Light.ttf') format('truetype'); + font-style: normal; + font-weight: 300; + text-rendering: optimizeLegibility; +} + +:root, :root body { + margin: 0; + padding: 0; + border: 0; + font-size: 100%; + font: inherit; + vertical-align: baseline; + background: rgb(95, 95, 95); + color: rgba(255, 255, 255, 0.75); + font-size: 16px; + font-family: 'Roboto', sans-serif; + font-weight: 300; +} + +:root a, :root a:visited { + text-decoration: none; + cursor: pointer; + color: rgb(0, 151, 167); /* #f80 */ +} + +:root a:hover { + color: rgb(0, 174, 193); +} + +h1,h2,h3,h4,h5,h6 { + font-weight: 300; + text-transform: uppercase; + text-decoration: none; +} + +h1 { + font-size: 24px; + line-height: 36px; + color: rgb(0, 151, 167); +} + +h2 { + font-size: 20px; + line-height: 34px; +} + +code,kbd,pre,samp { + font-family: 'Roboto Mono', monospace; +} + +.parity-navbar { + background: rgb(65, 65, 65); + height: 72px; + padding: 0 1rem; + display: flex; + justify-content: space-between; +} + +.parity-status { + clear: both; + padding: 1rem; + margin: 1rem 0; + text-align: right; + opacity: 0.75; +} + +.parity-box { + margin: 1rem; + padding: 1rem; + background-color: rgb(48, 48, 48); + box-sizing: border-box; + box-shadow: rgba(0, 0, 0, 0.117647) 0px 1px 6px, rgba(0, 0, 0, 0.117647) 0px 1px 4px; + border-radius: 2px; + z-index: 1; + color: #aaa; +} + +.parity-box h1, +.parity-box h2, +.parity-box h3, +.parity-box h4, +.parity-box h5, +.parity-box h6 { + margin: 0; +} diff --git a/js-old/src/i18n/_default/account.js b/js-old/src/i18n/_default/account.js new file mode 100644 index 0000000000000000000000000000000000000000..7c9d255204317327e7380484f7918991b4c0b950 --- /dev/null +++ b/js-old/src/i18n/_default/account.js @@ -0,0 +1,39 @@ +// 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 . + +export default { + button: { + delete: `delete`, + edit: `edit`, + faucet: `Kovan ETH`, + password: `password`, + shapeshift: `shapeshift`, + transfer: `transfer`, + verify: `verify` + }, + hardware: { + confirmDelete: `Are you sure you want to remove the following hardware address from your account list?` + }, + header: { + outgoingTransactions: `{count} outgoing transactions`, + uuid: `uuid: {uuid}` + }, + title: `Account Management`, + transactions: { + poweredBy: `Transaction list powered by {etherscan}`, + title: `transactions` + } +}; diff --git a/js-old/src/i18n/_default/accounts.js b/js-old/src/i18n/_default/accounts.js new file mode 100644 index 0000000000000000000000000000000000000000..2db3d5fd983860ef10bbb5d33d4db927a2343206 --- /dev/null +++ b/js-old/src/i18n/_default/accounts.js @@ -0,0 +1,34 @@ +// 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 . + +export default { + button: { + newAccount: `account`, + newWallet: `wallet`, + vaults: `vaults` + }, + summary: { + minedBlock: `Mined at block #{blockNumber}` + }, + title: `Accounts Overview`, + tooltip: { + actions: `actions relating to the current view are available on the toolbar for quick access, be it for performing actions or creating a new item`, + overview: `your accounts are visible for easy access, allowing you to edit the meta information, make transfers, view transactions and fund the account` + }, + tooltips: { + owner: `{name} (owner)` + } +}; diff --git a/js/src/i18n/_default/addAddress.js b/js-old/src/i18n/_default/addAddress.js similarity index 100% rename from js/src/i18n/_default/addAddress.js rename to js-old/src/i18n/_default/addAddress.js diff --git a/js/src/i18n/_default/addContract.js b/js-old/src/i18n/_default/addContract.js similarity index 100% rename from js/src/i18n/_default/addContract.js rename to js-old/src/i18n/_default/addContract.js diff --git a/js/src/i18n/_default/address.js b/js-old/src/i18n/_default/address.js similarity index 100% rename from js/src/i18n/_default/address.js rename to js-old/src/i18n/_default/address.js diff --git a/js/src/i18n/_default/addressSelect.js b/js-old/src/i18n/_default/addressSelect.js similarity index 100% rename from js/src/i18n/_default/addressSelect.js rename to js-old/src/i18n/_default/addressSelect.js diff --git a/js/src/i18n/_default/addresses.js b/js-old/src/i18n/_default/addresses.js similarity index 100% rename from js/src/i18n/_default/addresses.js rename to js-old/src/i18n/_default/addresses.js diff --git a/js-old/src/i18n/_default/application.js b/js-old/src/i18n/_default/application.js new file mode 100644 index 0000000000000000000000000000000000000000..f2e6be1ee1900e2d16e12ff6790e58c4c27a1d59 --- /dev/null +++ b/js-old/src/i18n/_default/application.js @@ -0,0 +1,30 @@ +// 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 . + +export default { + frame: { + error: `ERROR: This application cannot and should not be loaded in an embedded iFrame` + }, + status: { + consensus: { + capable: `Upgrade not required.`, + capableUntil: `Upgrade required before #{blockNumber}`, + incapableSince: `Upgrade required since #{blockNumber}`, + unknown: `Upgrade status is unknown.` + }, + upgrade: `Upgrade` + } +}; diff --git a/js/src/api/pubsub/signer/signer.js b/js-old/src/i18n/_default/connection.js similarity index 56% rename from js/src/api/pubsub/signer/signer.js rename to js-old/src/i18n/_default/connection.js index 25db34bdd5542b84a94ad4c9c96eab62b14b5631..e51943178e738e974ab10e5533b3a97c7f92a251 100644 --- a/js/src/api/pubsub/signer/signer.js +++ b/js-old/src/i18n/_default/connection.js @@ -13,25 +13,14 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import PubsubBase from '../pubsubBase'; -import { outSignerRequest } from '../../format/output'; - -export default class Signer 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)); - }); +export default { + connectingAPI: `Connecting to the Parity Secure API.`, + connectingNode: `Connecting to the Parity Node. If this informational message persists, please ensure that your Parity node is running and reachable on the network.`, + invalidToken: `invalid signer token`, + noConnection: `Unable to make a connection to the Parity Secure API. To update your secure token or to generate a new one, run {newToken} and paste the generated token into the space below.`, + token: { + hint: `a generated token from Parity`, + label: `secure token` } -} +}; diff --git a/js/src/i18n/_default/contract.js b/js-old/src/i18n/_default/contract.js similarity index 100% rename from js/src/i18n/_default/contract.js rename to js-old/src/i18n/_default/contract.js diff --git a/js/src/i18n/_default/contracts.js b/js-old/src/i18n/_default/contracts.js similarity index 100% rename from js/src/i18n/_default/contracts.js rename to js-old/src/i18n/_default/contracts.js diff --git a/js-old/src/i18n/_default/createAccount.js b/js-old/src/i18n/_default/createAccount.js new file mode 100644 index 0000000000000000000000000000000000000000..8930fc7b40a7c43bd84c3a61548d2b2f02b863c6 --- /dev/null +++ b/js-old/src/i18n/_default/createAccount.js @@ -0,0 +1,160 @@ +// 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 . + +export default { + accountDetails: { + address: { + hint: `the network address for the account`, + label: `address` + }, + phrase: { + hint: `the account recovery phrase`, + label: `owner recovery phrase (keep private and secure, it allows full and unlimited access to the account)` + } + }, + accountDetailsGeth: { + imported: `You have completed the import of {number} addresses from the Geth keystore. These will now be available in your accounts list as a normal account, along with their associated balances on the network.` + }, + button: { + back: `Back`, + cancel: `Cancel`, + create: `Create`, + done: `Done`, + import: `Import`, + next: `Next`, + print: `Print Phrase` + }, + creationType: { + fromGeth: { + description: `Import accounts from the Geth keystore with the original password`, + label: `Geth keystore` + }, + fromJSON: { + description: `Import an industry-standard JSON keyfile with the original password`, + label: `JSON file` + }, + fromNew: { + description: `Selecting your identity icon and specifying the password`, + label: `New Account` + }, + fromPhrase: { + description: `Recover using a previously stored recovery phrase and new password`, + label: `Recovery phrase` + }, + fromPresale: { + description: `Import an Ethereum presale wallet file with the original password`, + label: `Presale wallet` + }, + fromRaw: { + description: `Enter a previously created raw private key with a new password`, + label: `Private key` + }, + info: `Please select the type of account you want to create. Either create an account via name & password, or import it from a variety of existing sources. From here the wizard will guide you through the process of completing your account creation.` + }, + newAccount: { + hint: { + hint: `(optional) a hint to help with remembering the password`, + label: `password hint` + }, + name: { + hint: `a descriptive name for the account`, + label: `account name` + }, + password: { + hint: `a strong, unique password`, + label: `password` + }, + password2: { + hint: `verify your password`, + label: `password (repeat)` + } + }, + newGeth: { + available: `There are currently {count} importable keys available from the Geth keystore which are not already available on your Parity instance. Select the accounts you wish to import and move to the next step to complete the import.`, + noKeys: `There are currently no importable keys available from the Geth keystore, which are not already available on your Parity instance` + }, + newImport: { + file: { + hint: `the wallet file for import`, + label: `wallet file` + }, + hint: { + hint: `(optional) a hint to help with remembering the password`, + label: `password hint` + }, + name: { + hint: `a descriptive name for the account`, + label: `account name` + }, + password: { + hint: `the password to unlock the wallet`, + label: `password` + } + }, + rawKey: { + hint: { + hint: `(optional) a hint to help with remembering the password`, + label: `password hint` + }, + name: { + hint: `a descriptive name for the account`, + label: `account name` + }, + password: { + hint: `a strong, unique password`, + label: `password` + }, + password2: { + hint: `verify your password`, + label: `password (repeat)` + }, + private: { + hint: `the raw hex encoded private key`, + label: `private key` + } + }, + recoveryPhrase: { + hint: { + hint: `(optional) a hint to help with remembering the password`, + label: `password hint` + }, + name: { + hint: `a descriptive name for the account`, + label: `account name` + }, + password: { + hint: `a strong, unique password`, + label: `password` + }, + password2: { + hint: `verify your password`, + label: `password (repeat)` + }, + phrase: { + hint: `the account recovery phrase`, + label: `account recovery phrase` + }, + windowsKey: { + label: `Key was created with Parity <1.4.5 on Windows` + } + }, + title: { + accountInfo: `account information`, + createAccount: `create account`, + createType: `creation type`, + importWallet: `import wallet` + } +}; diff --git a/js-old/src/i18n/_default/createWallet.js b/js-old/src/i18n/_default/createWallet.js new file mode 100644 index 0000000000000000000000000000000000000000..eeb9e9a9832494d1a8a9c05f513de71ceaa72749 --- /dev/null +++ b/js-old/src/i18n/_default/createWallet.js @@ -0,0 +1,106 @@ +// 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 . + +export default { + button: { + add: `Add`, + cancel: `Cancel`, + close: `Close`, + create: `Create`, + done: `Done`, + next: `Next`, + sending: `Sending...` + }, + deployment: { + message: `The deployment is currently in progress` + }, + details: { + address: { + hint: `the wallet contract address`, + label: `wallet address` + }, + dayLimitMulti: { + hint: `amount of ETH spendable without confirmations`, + label: `wallet day limit` + }, + description: { + hint: `the local description for this wallet`, + label: `wallet description (optional)` + }, + descriptionMulti: { + hint: `the local description for this wallet`, + label: `wallet description (optional)` + }, + name: { + hint: `the local name for this wallet`, + label: `wallet name` + }, + nameMulti: { + hint: `the local name for this wallet`, + label: `wallet name` + }, + ownerMulti: { + hint: `the owner account for this contract`, + label: `from account (contract owner)` + }, + ownersMulti: { + label: `other wallet owners` + }, + ownersMultiReq: { + hint: `number of required owners to accept a transaction`, + label: `required owners` + } + }, + info: { + added: `added`, + copyAddress: `copy address to clipboard`, + created: `{name} has been {deployedOrAdded} at`, + dayLimit: `The daily limit is set to {dayLimit} ETH.`, + deployed: `deployed`, + numOwners: `{numOwners} owners are required to confirm a transaction.`, + owners: `The following are wallet owners` + }, + rejected: { + message: `The deployment has been rejected`, + state: `The wallet will not be created. You can safely close this window.`, + title: `rejected` + }, + states: { + completed: `The contract deployment has been completed`, + confirmationNeeded: `The contract deployment needs confirmations from other owners of the Wallet`, + preparing: `Preparing transaction for network transmission`, + validatingCode: `Validating the deployed contract code`, + waitingConfirm: `Waiting for confirmation of the transaction in the Parity Secure Signer`, + waitingReceipt: `Waiting for the contract deployment transaction receipt` + }, + steps: { + deployment: `wallet deployment`, + details: `wallet details`, + info: `wallet informaton`, + type: `wallet type` + }, + type: { + multisig: { + description: `Create/Deploy a {link} Wallet`, + label: `Multi-Sig wallet`, + link: `standard multi-signature` + }, + watch: { + description: `Add an existing wallet to your accounts`, + label: `Watch a wallet` + } + } +}; diff --git a/js/src/i18n/_default/dapp.js b/js-old/src/i18n/_default/dapp.js similarity index 100% rename from js/src/i18n/_default/dapp.js rename to js-old/src/i18n/_default/dapp.js diff --git a/js-old/src/i18n/_default/dapps.js b/js-old/src/i18n/_default/dapps.js new file mode 100644 index 0000000000000000000000000000000000000000..9ed3415d16842ef143b0cdd30ef800a5526da703 --- /dev/null +++ b/js-old/src/i18n/_default/dapps.js @@ -0,0 +1,45 @@ +// 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 . + +export default { + add: { + builtin: { + desc: `Experimental applications developed by the Parity team to show off dapp capabilities, integration, experimental features and to control certain network-wide client behaviour.`, + label: `Applications bundled with Parity` + }, + label: `visible applications`, + local: { + desc: `All applications installed locally on the machine by the user for access by the Parity client.`, + label: `Applications locally available` + }, + network: { + desc: `These applications are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each application before interacting.`, + label: `Applications on the global network` + } + }, + button: { + edit: `edit`, + permissions: `permissions` + }, + external: { + accept: `I understand that these applications are not affiliated with Parity`, + warning: `Applications made available on the network by 3rd-party authors are not affiliated with Parity nor are they published by Parity. Each remain under the control of their respective authors. Please ensure that you understand the goals for each before interacting.` + }, + label: `Decentralized Applications`, + permissions: { + label: `visible dapp accounts` + } +}; diff --git a/js/src/i18n/_default/deleteAccount.js b/js-old/src/i18n/_default/deleteAccount.js similarity index 100% rename from js/src/i18n/_default/deleteAccount.js rename to js-old/src/i18n/_default/deleteAccount.js diff --git a/js-old/src/i18n/_default/deployContract.js b/js-old/src/i18n/_default/deployContract.js new file mode 100644 index 0000000000000000000000000000000000000000..0b5a05503c6729891ce5ea8ebe1855c6c9b2d810 --- /dev/null +++ b/js-old/src/i18n/_default/deployContract.js @@ -0,0 +1,90 @@ +// 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 . + +export default { + busy: { + title: `The deployment is currently in progress` + }, + button: { + cancel: `Cancel`, + close: `Close`, + create: `Create`, + done: `Done`, + next: `Next` + }, + completed: { + description: `Your contract has been deployed at` + }, + details: { + abi: { + hint: `the abi of the contract to deploy or solc combined-output`, + label: `abi / solc combined-output` + }, + address: { + hint: `the owner account for this contract`, + label: `from account (contract owner)` + }, + advanced: { + label: `advanced sending options` + }, + amount: { + hint: `the amount to transfer to the contract`, + label: `amount to transfer (in {tag})` + }, + code: { + hint: `the compiled code of the contract to deploy`, + label: `code` + }, + contract: { + label: `select a contract` + }, + description: { + hint: `a description for the contract`, + label: `contract description (optional)` + }, + name: { + hint: `a name for the deployed contract`, + label: `contract name` + } + }, + owner: { + noneSelected: `a valid account as the contract owner needs to be selected` + }, + parameters: { + choose: `Choose the contract parameters` + }, + rejected: { + description: `You can safely close this window, the contract deployment will not occur.`, + title: `The deployment has been rejected` + }, + state: { + completed: `The contract deployment has been completed`, + confirmationNeeded: `The operation needs confirmations from the other owners of the contract`, + preparing: `Preparing transaction for network transmission`, + validatingCode: `Validating the deployed contract code`, + waitReceipt: `Waiting for the contract deployment transaction receipt`, + waitSigner: `Waiting for confirmation of the transaction in the Parity Secure Signer` + }, + title: { + completed: `completed`, + deployment: `deployment`, + details: `contract details`, + extras: `extra information`, + failed: `deployment failed`, + parameters: `contract parameters`, + rejected: `rejected` + } +}; diff --git a/js/src/i18n/nl/details_windows.js b/js-old/src/i18n/_default/details_windows.js similarity index 100% rename from js/src/i18n/nl/details_windows.js rename to js-old/src/i18n/_default/details_windows.js diff --git a/js/src/i18n/_default/editMeta.js b/js-old/src/i18n/_default/editMeta.js similarity index 100% rename from js/src/i18n/_default/editMeta.js rename to js-old/src/i18n/_default/editMeta.js diff --git a/js-old/src/i18n/_default/errors.js b/js-old/src/i18n/_default/errors.js new file mode 100644 index 0000000000000000000000000000000000000000..76fed24cd61ab0b6628a105b28ac6f0b477adaa6 --- /dev/null +++ b/js-old/src/i18n/_default/errors.js @@ -0,0 +1,24 @@ +// 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 . + +export default { + duplicateName: `the name already exists`, + invalidKey: `the raw key needs to be hex, 64 characters in length and contain the prefix "0x"`, + noFile: `select a valid wallet file to import`, + noKey: `you need to provide the raw private key`, + noMatchPassword: `the supplied passwords does not match`, + noName: `you need to specify a valid name` +}; diff --git a/js-old/src/i18n/_default/executeContract.js b/js-old/src/i18n/_default/executeContract.js new file mode 100644 index 0000000000000000000000000000000000000000..011264d3fe6cb1b2e265568f6ecf0943670ac95b --- /dev/null +++ b/js-old/src/i18n/_default/executeContract.js @@ -0,0 +1,58 @@ +// 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 . + +export default { + busy: { + posted: `Your transaction has been posted to the network`, + title: `The function execution is in progress`, + waitAuth: `Waiting for authorization in the Parity Signer` + }, + button: { + cancel: `cancel`, + done: `done`, + next: `next`, + post: `post transaction`, + prev: `prev` + }, + details: { + address: { + hint: `from account`, + label: `the account to transact with` + }, + advancedCheck: { + label: `advanced sending options` + }, + amount: { + hint: `the amount to send to with the transaction`, + label: `transaction value (in ETH)` + }, + function: { + hint: `the function to call on the contract`, + label: `function to execute` + } + }, + rejected: { + state: `You can safely close this window, the function execution will not occur.`, + title: `The execution has been rejected` + }, + steps: { + advanced: `advanced options`, + complete: `complete`, + rejected: `rejected`, + sending: `sending`, + transfer: `function details` + } +}; diff --git a/js/src/i18n/_default/extension.js b/js-old/src/i18n/_default/extension.js similarity index 100% rename from js/src/i18n/_default/extension.js rename to js-old/src/i18n/_default/extension.js diff --git a/js/src/i18n/_default/faucet.js b/js-old/src/i18n/_default/faucet.js similarity index 100% rename from js/src/i18n/_default/faucet.js rename to js-old/src/i18n/_default/faucet.js diff --git a/js-old/src/i18n/_default/firstRun.js b/js-old/src/i18n/_default/firstRun.js new file mode 100644 index 0000000000000000000000000000000000000000..5f41fa9c4487e710f6a756958087f733d1123cf3 --- /dev/null +++ b/js-old/src/i18n/_default/firstRun.js @@ -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 . + +export default { + button: { + close: `Close`, + create: `Create`, + next: `Next`, + print: `Print Phrase`, + skip: `Skip` + }, + completed: { + congrats: `Congratulations! Your node setup has been completed successfully and you are ready to use the application.`, + next: `Next you will receive a walk-through of the available functions and the general application interface to get you up and running in record time.` + }, + title: { + completed: `completed`, + newAccount: `new account`, + recovery: `recovery`, + terms: `terms`, + welcome: `welcome` + }, + tnc: { + accept: `I accept these terms and conditions` + }, + welcome: { + description: `As part of a new installation, the next few steps will guide you through the process of setting up your Parity instance and your associated accounts. Our aim is to make it as simple as possible and to get you up and running in record-time, so please bear with us. Once completed you will have -`, + greeting: `Welcome to Parity, the fastest and simplest way to run your node.`, + next: `Click Next to continue your journey.`, + step: { + account: `Created your first Parity account`, + privacy: `Understood our privacy policy & terms of operation`, + recovery: `Have the ability to recover your account` + } + } +}; diff --git a/js/src/i18n/_default/home.js b/js-old/src/i18n/_default/home.js similarity index 100% rename from js/src/i18n/_default/home.js rename to js-old/src/i18n/_default/home.js diff --git a/js-old/src/i18n/_default/index.js b/js-old/src/i18n/_default/index.js new file mode 100644 index 0000000000000000000000000000000000000000..687e558dc170a0c5b495e3b36ceba4ba379f110f --- /dev/null +++ b/js-old/src/i18n/_default/index.js @@ -0,0 +1,59 @@ +// 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 . + +export account from './account'; +export accounts from './accounts'; +export addAddress from './addAddress'; +export addContract from './addContract'; +export address from './address'; +export addressSelect from './addressSelect'; +export addresses from './addresses'; +export application from './application'; +export connection from './connection'; +export contract from './contract'; +export contracts from './contracts'; +export createAccount from './createAccount'; +export createWallet from './createWallet'; +export dapp from './dapp'; +export dapps from './dapps'; +export deleteAccount from './deleteAccount'; +export deployContract from './deployContract'; +export editMeta from './editMeta'; +export errors from './errors'; +export executeContract from './executeContract'; +export extension from './extension'; +export faucet from './faucet'; +export firstRun from './firstRun'; +export home from './home'; +export loadContract from './loadContract'; +export parityBar from './parityBar'; +export passwordChange from './passwordChange'; +export saveContract from './saveContract'; +export settings from './settings'; +export shapeshift from './shapeshift'; +export signer from './signer'; +export status from './status'; +export tabBar from './tabBar'; +export transfer from './transfer'; +export txEditor from './txEditor'; +export ui from './ui'; +export upgradeParity from './upgradeParity'; +export vaults from './vaults'; +export verification from './verification'; +export wallet from './wallet'; +export walletSettings from './walletSettings'; +export web from './web'; +export writeContract from './writeContract'; diff --git a/js/src/i18n/_default/loadContract.js b/js-old/src/i18n/_default/loadContract.js similarity index 100% rename from js/src/i18n/_default/loadContract.js rename to js-old/src/i18n/_default/loadContract.js diff --git a/js/src/i18n/_default/parityBar.js b/js-old/src/i18n/_default/parityBar.js similarity index 100% rename from js/src/i18n/_default/parityBar.js rename to js-old/src/i18n/_default/parityBar.js diff --git a/js/src/i18n/_default/passwordChange.js b/js-old/src/i18n/_default/passwordChange.js similarity index 100% rename from js/src/i18n/_default/passwordChange.js rename to js-old/src/i18n/_default/passwordChange.js diff --git a/js/src/i18n/_default/saveContract.js b/js-old/src/i18n/_default/saveContract.js similarity index 100% rename from js/src/i18n/_default/saveContract.js rename to js-old/src/i18n/_default/saveContract.js diff --git a/js-old/src/i18n/_default/settings.js b/js-old/src/i18n/_default/settings.js new file mode 100644 index 0000000000000000000000000000000000000000..ea447e4a99db4fe284d6b4ac50d46685e1381daa --- /dev/null +++ b/js-old/src/i18n/_default/settings.js @@ -0,0 +1,101 @@ +// 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 . + +export default { + background: { + button_more: `generate more`, + overview_0: `The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new Signer token. This is so that decentralized applications cannot pretend to be trustworthy.`, + overview_1: `Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or use a new Signer token.`, + label: `background` + }, + parity: { + chains: { + chain_classic: `Parity syncs to the Ethereum Classic network`, + chain_dev: `Parity uses a local development chain`, + chain_expanse: `Parity syncs to the Expanse network`, + chain_foundation: `Parity syncs to the Ethereum network launched by the Ethereum Foundation`, + chain_kovan: `Parity syncs to the Kovan test network`, + chain_olympic: `Parity syncs to the Olympic test network`, + chain_ropsten: `Parity syncs to the Ropsten test network`, + cmorden_kovan: `Parity syncs to Morden (Classic) test network`, + hint: `the chain for the Parity node to sync to`, + label: `chain/network to sync` + }, + languages: { + hint: `the language this interface is displayed with`, + label: `UI language` + }, + loglevels: `Choose the different logs level.`, + modes: { + hint: `the syncing mode for the Parity node`, + label: `mode of operation`, + mode_active: `Parity continuously syncs the chain`, + mode_dark: `Parity syncs only when the RPC is active`, + mode_offline: `Parity doesn't sync`, + mode_passive: `Parity syncs initially, then sleeps and wakes regularly to resync` + }, + overview_0: `Control the Parity node settings and nature of syncing via this interface.`, + label: `parity` + }, + proxy: { + details_0: `Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser,`, + details_1: `To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}.`, + details_macos: `macOS`, + details_ubuntu: `Ubuntu`, + details_windows: `Windows`, + overview_0: `The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses.`, + label: `proxy` + }, + views: { + accounts: { + description: `A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, manage your balances and fund your accounts.`, + label: `Accounts` + }, + addresses: { + description: `A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available at the click of a button when transacting.`, + label: `Addressbook` + }, + apps: { + description: `Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and interact with application from around the network.`, + label: `Applications` + }, + contracts: { + description: `Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, specifically for advanced users that understand the inner working of certain contracts.`, + label: `Contracts` + }, + overview_0: `Manage the available application views using only the parts of the application applicable to you.`, + overview_1: `Are you an end-user? The defaults are setup for both beginner and advanced users alike.`, + overview_2: `Are you a developer? Add some features to manage contracts and interact with application deployments.`, + overview_3: `Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation.`, + settings: { + description: `This view. Allows you to customize the application in term of options, operation and look and feel.`, + label: `Settings` + }, + signer: { + description: `The secure transaction management area of the application where you can approve any outgoing transactions made from the application as well as those placed into the queue by decentralized applications.`, + label: `Signer` + }, + status: { + description: `See how the Parity node is performing in terms of connections to the network, logs from the actual running instance and details of mining (if enabled and configured).`, + label: `Status` + }, + label: `views`, + home: { + label: `Home` + } + }, + label: `settings` +}; diff --git a/js/src/i18n/_default/shapeshift.js b/js-old/src/i18n/_default/shapeshift.js similarity index 100% rename from js/src/i18n/_default/shapeshift.js rename to js-old/src/i18n/_default/shapeshift.js diff --git a/js-old/src/i18n/_default/signer.js b/js-old/src/i18n/_default/signer.js new file mode 100644 index 0000000000000000000000000000000000000000..3f8615c52be9d6e4851ec86065032a57ff63bfcb --- /dev/null +++ b/js-old/src/i18n/_default/signer.js @@ -0,0 +1,103 @@ +// 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 . + +export default { + embedded: { + noPending: `There are currently no pending requests awaiting your confirmation` + }, + mainDetails: { + editTx: `Edit conditions/gas/gasPrice`, + tooltips: { + total1: `The value of the transaction including the mining fee is {total} {type}.`, + total2: `(This includes a mining fee of {fee} {token})`, + value1: `The value of the transaction.` + } + }, + requestOrigin: { + dapp: `by a dapp at {url}`, + ipc: `via IPC session`, + rpc: `via RPC {rpc}`, + signerCurrent: `via current tab`, + signerUI: `via UI session`, + unknownInterface: `via unknown interface`, + unknownRpc: `unidentified`, + unknownUrl: `unknown URL` + }, + requestsPage: { + noPending: `There are no requests requiring your confirmation.`, + pendingTitle: `Pending Requests`, + queueTitle: `Local Transactions` + }, + sending: { + hardware: { + confirm: `Please confirm the transaction on your attached hardware device`, + connect: `Please attach your hardware device before confirming the transaction` + } + }, + signRequest: { + request: `A request to sign data using your account:`, + state: { + confirmed: `Confirmed`, + rejected: `Rejected` + }, + unknownBinary: `(Unknown binary data)`, + warning: `WARNING: This consequences of doing this may be grave. Confirm the request only if you are sure.` + }, + title: `Trusted Signer`, + txPending: { + buttons: { + viewToggle: `view transaction` + } + }, + txPendingConfirm: { + buttons: { + confirmBusy: `Confirming...`, + confirmRequest: `Confirm Request` + }, + errors: { + invalidWallet: `Given wallet file is invalid.` + }, + password: { + decrypt: { + hint: `decrypt the key`, + label: `Key Password` + }, + unlock: { + hint: `unlock the account`, + label: `Account Password` + } + }, + passwordHint: `(hint) {passwordHint}`, + selectKey: { + hint: `The keyfile to use for this account`, + label: `Select Local Key` + }, + tooltips: { + password: `Please provide a password for this account` + } + }, + txPendingForm: { + changedMind: `I've changed my mind`, + reject: `reject request` + }, + txPendingReject: { + buttons: { + reject: `Reject Request` + }, + info: `Are you sure you want to reject request?`, + undone: `This cannot be undone` + } +}; diff --git a/js-old/src/i18n/_default/status.js b/js-old/src/i18n/_default/status.js new file mode 100644 index 0000000000000000000000000000000000000000..536c0ff909b102b8bca21631566c0307fc8a1a7e --- /dev/null +++ b/js-old/src/i18n/_default/status.js @@ -0,0 +1,66 @@ +// 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 . + +export default { + debug: { + reverse: `Reverse Order`, + stopped: `Refresh and display of logs from Parity is currently stopped via the UI, start it to see the latest updates.`, + title: `Node Logs` + }, + miningSettings: { + input: { + author: { + hint: `the mining author`, + label: `author` + }, + extradata: { + hint: `extra data for mined blocks`, + label: `extradata` + }, + gasFloor: { + hint: `the gas floor target for mining`, + label: `gas floor target` + }, + gasPrice: { + hint: `the minimum gas price for mining`, + label: `minimal gas price` + } + }, + title: `mining settings` + }, + status: { + hashrate: `{hashrate} H/s`, + input: { + chain: `chain`, + enode: `enode`, + no: `no`, + peers: `peers`, + port: `network port`, + rpcEnabled: `rpc enabled`, + rpcInterface: `rpc interface`, + rpcPort: `rpc port`, + yes: `yes` + }, + title: { + bestBlock: `best block`, + hashRate: `hash rate`, + network: `network settings`, + node: `Node`, + peers: `peers` + } + }, + title: `Status` +}; diff --git a/js/src/i18n/_default/tabBar.js b/js-old/src/i18n/_default/tabBar.js similarity index 100% rename from js/src/i18n/_default/tabBar.js rename to js-old/src/i18n/_default/tabBar.js diff --git a/js-old/src/i18n/_default/transfer.js b/js-old/src/i18n/_default/transfer.js new file mode 100644 index 0000000000000000000000000000000000000000..3207f5b067bae12e8d1ab47fc8e699769c8f5b7d --- /dev/null +++ b/js-old/src/i18n/_default/transfer.js @@ -0,0 +1,61 @@ +// 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 . + +export default { + advanced: { + data: { + hint: `the data to pass through with the transaction`, + label: `transaction data` + } + }, + buttons: { + back: `Back`, + cancel: `Cancel`, + close: `Close`, + next: `Next`, + send: `Send` + }, + details: { + advanced: { + label: `advanced sending options` + }, + amount: { + hint: `the amount to transfer to the recipient`, + label: `amount to transfer (in {tag})` + }, + fullBalance: { + label: `full account balance` + }, + recipient: { + hint: `the recipient address`, + label: `recipient address` + }, + sender: { + hint: `the sender address`, + label: `sender address` + }, + total: { + label: `total transaction amount` + } + }, + wallet: { + confirmation: `This transaction needs confirmation from other owners.`, + operationHash: `operation hash` + }, + warning: { + wallet_spent_limit: `This transaction value is above the remaining daily limit. It will need to be confirmed by other owners.` + } +}; diff --git a/js/src/i18n/_default/txEditor.js b/js-old/src/i18n/_default/txEditor.js similarity index 100% rename from js/src/i18n/_default/txEditor.js rename to js-old/src/i18n/_default/txEditor.js diff --git a/js-old/src/i18n/_default/ui.js b/js-old/src/i18n/_default/ui.js new file mode 100644 index 0000000000000000000000000000000000000000..d84e7bd13bbe6bc413074bdd8bbec6548a92201c --- /dev/null +++ b/js-old/src/i18n/_default/ui.js @@ -0,0 +1,163 @@ +// 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 . + +export default { + actionbar: { + export: { + button: { + export: `export` + } + }, + import: { + button: { + cancel: `Cancel`, + confirm: `Confirm`, + import: `import` + }, + confirm: `Confirm that this is what was intended to import.`, + error: `An error occured: {errorText}`, + step: { + error: `error`, + select: `select a file`, + validate: `validate` + }, + title: `Import from a file` + }, + search: { + hint: `Enter search input...` + }, + sort: { + sortBy: `Sort by {label}`, + typeDefault: `Default`, + typeEth: `Sort by ETH`, + typeName: `Sort by name`, + typeTags: `Sort by tags` + } + }, + balance: { + none: `No balances associated with this account` + }, + blockStatus: { + bestBlock: `{blockNumber} best block`, + syncStatus: `{currentBlock}/{highestBlock} syncing`, + warpRestore: `{percentage}% warp restore`, + warpStatus: `, {percentage}% historic` + }, + confirmDialog: { + no: `no`, + yes: `yes` + }, + copyToClipboard: { + copied: `copied {data} to clipboard` + }, + errors: { + close: `close` + }, + fileSelect: { + defaultLabel: `Drop a file here, or click to select a file to upload` + }, + gasPriceSelector: { + customTooltip: { + transactions: `{number} {number, plural, one {transaction} other {transactions}} with gas price set from {minPrice} to {maxPrice}` + } + }, + identityName: { + null: `NULL`, + unnamed: `UNNAMED` + }, + methodDecoding: { + condition: { + block: `, {historic, select, true {Submitted} false {Submission}} at block {blockNumber}`, + time: `, {historic, select, true {Submitted} false {Submission}} at {timestamp}` + }, + deploy: { + address: `Deployed a contract at address`, + params: `with the following parameters:`, + willDeploy: `Will deploy a contract`, + withValue: `, sending {value}` + }, + gasUsed: `({gas} gas used)`, + gasValues: `{gas} gas ({gasPrice}M/{tag})`, + input: { + data: `data`, + input: `input`, + withInput: `with the {inputDesc} {inputValue}` + }, + receive: { + contract: `the contract`, + info: `{historic, select, true {Received} false {Will receive}} {valueEth} from {aContract}{address}` + }, + signature: { + info: `{historic, select, true {Executed} false {Will execute}} the {method} function on the contract {address} trsansferring {ethValue}{inputLength, plural, zero {,} other {passing the following {inputLength, plural, one {parameter} other {parameters}}}}` + }, + token: { + transfer: `{historic, select, true {Transferred} false {Will transfer}} {value} to {address}` + }, + transfer: { + contract: `the contract`, + info: `{historic, select, true {Transferred} false {Will transfer}} {valueEth} to {aContract}{address}` + }, + txValues: `{historic, select, true {Provided} false {Provides}} {gasProvided}{gasUsed} for a total transaction value of {totalEthValue}`, + unknown: { + info: `{historic, select, true {Executed} false {Will execute}} the {method} on the contract {address} transferring {ethValue}.` + } + }, + passwordStrength: { + label: `password strength` + }, + tooltips: { + button: { + done: `Done`, + next: `Next`, + skip: `Skip` + } + }, + txHash: { + confirmations: `{count} {value, plural, one {confirmation} other {confirmations}}`, + oog: `The transaction might have gone out of gas. Try again with more gas.`, + posted: `The transaction has been posted to the network with a hash of {hashLink}`, + waiting: `waiting for confirmations` + }, + vaultSelect: { + hint: `the vault this account is attached to`, + label: `associated vault` + }, + verification: { + gatherData: { + accountHasRequested: { + false: `You did not request verification from this account yet.`, + pending: `Checking if you requested verification…`, + true: `You already requested verification from this account.` + }, + accountIsVerified: { + false: `Your account is not verified yet.`, + pending: `Checking if your account is verified…`, + true: `Your account is already verified.` + }, + fee: `The additional fee is {amount} ETH.`, + isAbleToRequest: { + pending: `Validating your input…` + }, + isServerRunning: { + false: `The verification server is not running.`, + pending: `Checking if the verification server is running…`, + true: `The verification server is running.` + }, + nofee: `There is no additional fee.`, + termsOfService: `I agree to the terms and conditions below.` + } + } +}; diff --git a/js/src/i18n/_default/upgradeParity.js b/js-old/src/i18n/_default/upgradeParity.js similarity index 100% rename from js/src/i18n/_default/upgradeParity.js rename to js-old/src/i18n/_default/upgradeParity.js diff --git a/js/src/i18n/_default/vaults.js b/js-old/src/i18n/_default/vaults.js similarity index 100% rename from js/src/i18n/_default/vaults.js rename to js-old/src/i18n/_default/vaults.js diff --git a/js/src/i18n/_default/verification.js b/js-old/src/i18n/_default/verification.js similarity index 100% rename from js/src/i18n/_default/verification.js rename to js-old/src/i18n/_default/verification.js diff --git a/js/src/i18n/_default/wallet.js b/js-old/src/i18n/_default/wallet.js similarity index 100% rename from js/src/i18n/_default/wallet.js rename to js-old/src/i18n/_default/wallet.js diff --git a/js-old/src/i18n/_default/walletSettings.js b/js-old/src/i18n/_default/walletSettings.js new file mode 100644 index 0000000000000000000000000000000000000000..ddeae3798a736373d00bf923079d9518b8131545 --- /dev/null +++ b/js-old/src/i18n/_default/walletSettings.js @@ -0,0 +1,69 @@ +// 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 . + +export default { + addOwner: { + title: `Add Owner` + }, + buttons: { + cancel: `Cancel`, + close: `Close`, + next: `Next`, + send: `Send`, + sending: `Sending...` + }, + changes: { + modificationString: `For your modifications to be taken into account, + other owners have to send the same modifications. They can paste + this string to make it easier:`, + none: `No modifications have been made to the Wallet settings.`, + overview: `You are about to make the following modifications` + }, + edit: { + message: `In order to edit this contract's settings, at + least {owners, number} {owners, plural, one {owner } other {owners }} have to + send the very same modifications. You can paste a stringified version + of the modifications here.` + }, + modifications: { + daylimit: { + hint: `amount of ETH spendable without confirmations`, + label: `wallet day limit` + }, + fromString: { + label: `modifications` + }, + owners: { + label: `other wallet owners` + }, + required: { + hint: `number of required owners to accept a transaction`, + label: `required owners` + }, + sender: { + hint: `send modifications as this owner`, + label: `from account (wallet owner)` + } + }, + ownersChange: { + details: `from {from} to {to}`, + title: `Change Required Owners` + }, + rejected: `The transaction #{txid} has been rejected`, + removeOwner: { + title: `Remove Owner` + } +}; diff --git a/js/src/i18n/_default/web.js b/js-old/src/i18n/_default/web.js similarity index 100% rename from js/src/i18n/_default/web.js rename to js-old/src/i18n/_default/web.js diff --git a/js-old/src/i18n/_default/writeContract.js b/js-old/src/i18n/_default/writeContract.js new file mode 100644 index 0000000000000000000000000000000000000000..fc1100b7786ad303dd56fa6ff745da56490145b2 --- /dev/null +++ b/js-old/src/i18n/_default/writeContract.js @@ -0,0 +1,62 @@ +// 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 . + +export default { + buttons: { + autoCompile: `Auto-Compile`, + compile: `Compile`, + deploy: `Deploy`, + import: `Import Solidity`, + load: `Load`, + new: `New`, + optimise: `Optimise`, + save: `Save` + }, + compiling: { + action: `Please compile the source code.`, + busy: `Compiling...` + }, + details: { + saved: `(saved {timestamp})` + }, + error: { + noContract: `No contract has been found.`, + params: `An error occurred with the following description` + }, + input: { + abi: `ABI Interface`, + code: `Bytecode`, + metadata: `Metadata`, + swarm: `Swarm Metadata Hash` + }, + title: { + contract: `Select a contract`, + loading: `Loading...`, + main: `Write a Contract`, + messages: `Compiler messages`, + new: `New Solidity Contract`, + parameters: `Parameters`, + saved: `saved @ {timestamp}`, + selectSolidity: `Select a Solidity version`, + solidity: `Loading Solidity {version}` + }, + type: { + humanErc20: `Implementation of the Human Token Contract`, + implementErc20: `Implementation of ERC20 Token Contract`, + multisig: `Implementation of a multisig Wallet`, + standardErc20: `Standard ERC20 Token Contract` + } +}; diff --git a/js/src/i18n/constants.js b/js-old/src/i18n/constants.js similarity index 100% rename from js/src/i18n/constants.js rename to js-old/src/i18n/constants.js diff --git a/js/src/i18n/de/index.js b/js-old/src/i18n/de/index.js similarity index 100% rename from js/src/i18n/de/index.js rename to js-old/src/i18n/de/index.js diff --git a/js/src/i18n/de/settings.js b/js-old/src/i18n/de/settings.js similarity index 100% rename from js/src/i18n/de/settings.js rename to js-old/src/i18n/de/settings.js diff --git a/js/src/i18n/en/index.js b/js-old/src/i18n/en/index.js similarity index 100% rename from js/src/i18n/en/index.js rename to js-old/src/i18n/en/index.js diff --git a/js/src/i18n/en/settings.js b/js-old/src/i18n/en/settings.js similarity index 100% rename from js/src/i18n/en/settings.js rename to js-old/src/i18n/en/settings.js diff --git a/js/src/i18n/index.js b/js-old/src/i18n/index.js similarity index 100% rename from js/src/i18n/index.js rename to js-old/src/i18n/index.js diff --git a/js/src/i18n/languages.js b/js-old/src/i18n/languages.js similarity index 100% rename from js/src/i18n/languages.js rename to js-old/src/i18n/languages.js diff --git a/js/src/i18n/languages.spec.js b/js-old/src/i18n/languages.spec.js similarity index 100% rename from js/src/i18n/languages.spec.js rename to js-old/src/i18n/languages.spec.js diff --git a/js/src/i18n/nl/account.js b/js-old/src/i18n/nl/account.js similarity index 100% rename from js/src/i18n/nl/account.js rename to js-old/src/i18n/nl/account.js diff --git a/js/src/i18n/nl/accounts.js b/js-old/src/i18n/nl/accounts.js similarity index 100% rename from js/src/i18n/nl/accounts.js rename to js-old/src/i18n/nl/accounts.js diff --git a/js/src/i18n/nl/addAddress.js b/js-old/src/i18n/nl/addAddress.js similarity index 100% rename from js/src/i18n/nl/addAddress.js rename to js-old/src/i18n/nl/addAddress.js diff --git a/js/src/i18n/nl/addContract.js b/js-old/src/i18n/nl/addContract.js similarity index 100% rename from js/src/i18n/nl/addContract.js rename to js-old/src/i18n/nl/addContract.js diff --git a/js/src/i18n/nl/address.js b/js-old/src/i18n/nl/address.js similarity index 100% rename from js/src/i18n/nl/address.js rename to js-old/src/i18n/nl/address.js diff --git a/js/src/i18n/nl/addressSelect.js b/js-old/src/i18n/nl/addressSelect.js similarity index 100% rename from js/src/i18n/nl/addressSelect.js rename to js-old/src/i18n/nl/addressSelect.js diff --git a/js/src/i18n/nl/addresses.js b/js-old/src/i18n/nl/addresses.js similarity index 100% rename from js/src/i18n/nl/addresses.js rename to js-old/src/i18n/nl/addresses.js diff --git a/js/src/i18n/nl/application.js b/js-old/src/i18n/nl/application.js similarity index 100% rename from js/src/i18n/nl/application.js rename to js-old/src/i18n/nl/application.js diff --git a/js/src/i18n/nl/connection.js b/js-old/src/i18n/nl/connection.js similarity index 100% rename from js/src/i18n/nl/connection.js rename to js-old/src/i18n/nl/connection.js diff --git a/js/src/i18n/nl/contract.js b/js-old/src/i18n/nl/contract.js similarity index 100% rename from js/src/i18n/nl/contract.js rename to js-old/src/i18n/nl/contract.js diff --git a/js/src/i18n/nl/contracts.js b/js-old/src/i18n/nl/contracts.js similarity index 100% rename from js/src/i18n/nl/contracts.js rename to js-old/src/i18n/nl/contracts.js diff --git a/js/src/i18n/nl/createAccount.js b/js-old/src/i18n/nl/createAccount.js similarity index 100% rename from js/src/i18n/nl/createAccount.js rename to js-old/src/i18n/nl/createAccount.js diff --git a/js/src/i18n/nl/createWallet.js b/js-old/src/i18n/nl/createWallet.js similarity index 100% rename from js/src/i18n/nl/createWallet.js rename to js-old/src/i18n/nl/createWallet.js diff --git a/js/src/i18n/nl/dapp.js b/js-old/src/i18n/nl/dapp.js similarity index 100% rename from js/src/i18n/nl/dapp.js rename to js-old/src/i18n/nl/dapp.js diff --git a/js/src/i18n/nl/dapps.js b/js-old/src/i18n/nl/dapps.js similarity index 100% rename from js/src/i18n/nl/dapps.js rename to js-old/src/i18n/nl/dapps.js diff --git a/js/src/i18n/nl/deleteAccount.js b/js-old/src/i18n/nl/deleteAccount.js similarity index 100% rename from js/src/i18n/nl/deleteAccount.js rename to js-old/src/i18n/nl/deleteAccount.js diff --git a/js/src/i18n/nl/deployContract.js b/js-old/src/i18n/nl/deployContract.js similarity index 100% rename from js/src/i18n/nl/deployContract.js rename to js-old/src/i18n/nl/deployContract.js diff --git a/js/src/i18n/zh-Hant-TW/details_windows.js b/js-old/src/i18n/nl/details_windows.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/details_windows.js rename to js-old/src/i18n/nl/details_windows.js diff --git a/js/src/i18n/nl/editMeta.js b/js-old/src/i18n/nl/editMeta.js similarity index 100% rename from js/src/i18n/nl/editMeta.js rename to js-old/src/i18n/nl/editMeta.js diff --git a/js/src/i18n/nl/errors.js b/js-old/src/i18n/nl/errors.js similarity index 100% rename from js/src/i18n/nl/errors.js rename to js-old/src/i18n/nl/errors.js diff --git a/js/src/i18n/nl/executeContract.js b/js-old/src/i18n/nl/executeContract.js similarity index 100% rename from js/src/i18n/nl/executeContract.js rename to js-old/src/i18n/nl/executeContract.js diff --git a/js/src/i18n/nl/extension.js b/js-old/src/i18n/nl/extension.js similarity index 100% rename from js/src/i18n/nl/extension.js rename to js-old/src/i18n/nl/extension.js diff --git a/js/src/i18n/nl/faucet.js b/js-old/src/i18n/nl/faucet.js similarity index 100% rename from js/src/i18n/nl/faucet.js rename to js-old/src/i18n/nl/faucet.js diff --git a/js/src/i18n/nl/firstRun.js b/js-old/src/i18n/nl/firstRun.js similarity index 100% rename from js/src/i18n/nl/firstRun.js rename to js-old/src/i18n/nl/firstRun.js diff --git a/js/src/i18n/nl/home.js b/js-old/src/i18n/nl/home.js similarity index 100% rename from js/src/i18n/nl/home.js rename to js-old/src/i18n/nl/home.js diff --git a/js/src/i18n/nl/index.js b/js-old/src/i18n/nl/index.js similarity index 100% rename from js/src/i18n/nl/index.js rename to js-old/src/i18n/nl/index.js diff --git a/js/src/i18n/nl/loadContract.js b/js-old/src/i18n/nl/loadContract.js similarity index 100% rename from js/src/i18n/nl/loadContract.js rename to js-old/src/i18n/nl/loadContract.js diff --git a/js/src/i18n/nl/parityBar.js b/js-old/src/i18n/nl/parityBar.js similarity index 100% rename from js/src/i18n/nl/parityBar.js rename to js-old/src/i18n/nl/parityBar.js diff --git a/js/src/i18n/nl/passwordChange.js b/js-old/src/i18n/nl/passwordChange.js similarity index 100% rename from js/src/i18n/nl/passwordChange.js rename to js-old/src/i18n/nl/passwordChange.js diff --git a/js/src/i18n/nl/saveContract.js b/js-old/src/i18n/nl/saveContract.js similarity index 100% rename from js/src/i18n/nl/saveContract.js rename to js-old/src/i18n/nl/saveContract.js diff --git a/js-old/src/i18n/nl/settings.js b/js-old/src/i18n/nl/settings.js new file mode 100644 index 0000000000000000000000000000000000000000..f436d39c652415e28e0b5a0b1be27a37c8a2bc22 --- /dev/null +++ b/js-old/src/i18n/nl/settings.js @@ -0,0 +1,101 @@ +// 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 . + +export default { + background: { + button_more: `genereer meer`, + overview_0: `Het achtergrond patroon dat je nu kunt zien is uniek voor jouw Parity installatie. Het veranderd elke keer als je een nieuw Signer token genereerd. Op deze manier kunnen gedecentraliseerde applicaties niet doen alsof ze betrouwbaar zijn.`, + overview_1: `Kies het patroon dat je wilt en onthoud het. Dit patroon wordt vanaf nu altijd getoond, tenzij je je browser cache wist of een nieuw Signer token genereerd.`, + label: `achtergrond` + }, + parity: { + chains: { + chain_classic: `Parity synchroniseert met het Ethereum Classic netwerk`, + chain_dev: `Parity gebruikt een lokale ontwikkelaars chain`, + chain_expanse: `Parity synchroniseert met het Expanse netwerk`, + chain_foundation: `Parity synchroniseert met het Ethereum netwerk wat door de Ethereum Foundation is uitgebracht`, + chain_kovan: `Parity synchroniseert met het Kovan test netwerk`, + chain_olympic: `Parity synchroniseert met het Olympic test netwerk`, + chain_ropsten: `Parity synchroniseert met het Ropsten test netwerk`, + cmorden_kovan: `Parity synchroniseert met het Morden (Classic) test netwerk`, + hint: `de chain waarmee de Parity node synchroniseert`, + label: `te synchroniseren chain/netwerk` + }, + languages: { + hint: `de taal waarin deze interface wordt weergegeven`, + label: `Weergave taal` + }, + loglevels: `Kies hoeveel details er in het logboek worden bijgehouden.`, + modes: { + hint: `de synchronisatie modus van de Parity node`, + label: `Synchronisatie modus`, + mode_active: `Parity synchroniseert de chain continu`, + mode_dark: `Parity synchroniseert alleen als de RPC actief is`, + mode_offline: `Parity synchroniseert niet`, + mode_passive: `Parity synchroniseert in het begin. Daarna slaapt Parity en wordt regelmatig wakker voor synchronisatie` + }, + overview_0: `Pas de Parity node instellingen aan en kies de manier van synchroniseren in dit menu.`, + label: `parity` + }, + proxy: { + details_0: `In plaats van Parity te openen via het IP adres en poort-nummer, kun je toegang verkrijgen tot het .parity sub-domein door {homeProxy} te bezoeken. Om sub-domein gebaseerde routing in te stellen, dien je de proxy vermelding aan je browser proxy instellingen toe te voegen,`, + details_1: `Om je te helpen met het configureren van je proxy, zijn er instructies beschikbaar voor {windowsLink}, {macOSLink} or {ubuntuLink}.`, + details_macos: `macOS`, + details_ubuntu: `Ubuntu`, + details_windows: `Windows`, + overview_0: `Met de proxy instellingen heb je de mogelijkheid om via een makkelijk te onthouden adres toegang te verkrijgen tot Parity en alle onderliggende decentrale applicaties.`, + label: `proxy` + }, + views: { + accounts: { + description: `Een overzicht van alle aan deze Parity installatie verbonden accounts, inclusief geimporteerde accounts. Verzend transacties, ontvang inkomende transacties, berheer je saldo en financier je accounts.`, + label: `Accounts` + }, + addresses: { + description: `Een overzicht van alle door deze Parity installatie beheerde contacten en adresboek items. Monitor en volg accounts waarbij je transactie details met slechts een muisklik kunt weergeven.`, + label: `Adresboek` + }, + apps: { + description: `Decentrale applicaties die gebruik maken van het onderliggende Ethereum netwerk. Voeg applicaties toe, beheer je applicatie portfolio en maak gebruik van applicaties op het wereldwijde netwerk.`, + label: `Applicaties` + }, + contracts: { + description: `Monitor, volg en maak gebruik van specifieke contracten die op het netwerk zijn gezet. Dit is een meer technisch gerichte omgeving, voornamelijk bedoeld voor geavanceerde gebruikers die de werking van bepaalde contracten goed begrijpen.`, + label: `Contracten` + }, + overview_0: `Beheer de beschikbare weergaven van deze interface, en selecteer enkel de delen van de applicatie die voor jou van belang zijn.`, + overview_1: `Ben je een eind gebruiker? De standaard instellingen zijn geschikt voor zowel beginners als gevorderde gebruikers.`, + overview_2: `Ben je een ontwikkelaar? Voeg enkele functies toe om je contracten te beheren en gebruik te maken van gedecentraliseerde applicaties.`, + overview_3: `Ben je een miner of draai je een grootschalige node? Voeg enkele functies toe om je alle informatie te geven die je nodig hebt om je node te monitoren.`, + settings: { + description: `Deze weergave. Hiermee kun je Parity aan passen in termen van opties, bediening en look en feel.`, + label: `Instellingen` + }, + signer: { + description: `Het beveiligde transactie beheergebied van de applicatie waar je goedkeuring kunt verlenen aan elke uitgaande transactie die je hebt gemaakt met Parity evenals de transacties die in de wachtrij zijn geplaatst door decentrale applicaties.`, + label: `Signer` + }, + status: { + description: `Volg hoe de Parity node zijn werk doet en je verbind met het netwerk en bekijk de logboeken van de momenteel draaiende node met mining details (indien geconfigureerd en ingeschakeld).`, + label: `Status` + }, + label: `weergaven`, + home: { + label: `Thuis` + } + }, + label: `instellingen` +}; diff --git a/js/src/i18n/nl/shapeshift.js b/js-old/src/i18n/nl/shapeshift.js similarity index 100% rename from js/src/i18n/nl/shapeshift.js rename to js-old/src/i18n/nl/shapeshift.js diff --git a/js/src/i18n/nl/signer.js b/js-old/src/i18n/nl/signer.js similarity index 100% rename from js/src/i18n/nl/signer.js rename to js-old/src/i18n/nl/signer.js diff --git a/js/src/i18n/nl/status.js b/js-old/src/i18n/nl/status.js similarity index 100% rename from js/src/i18n/nl/status.js rename to js-old/src/i18n/nl/status.js diff --git a/js/src/i18n/nl/tabBar.js b/js-old/src/i18n/nl/tabBar.js similarity index 100% rename from js/src/i18n/nl/tabBar.js rename to js-old/src/i18n/nl/tabBar.js diff --git a/js/src/i18n/nl/transfer.js b/js-old/src/i18n/nl/transfer.js similarity index 100% rename from js/src/i18n/nl/transfer.js rename to js-old/src/i18n/nl/transfer.js diff --git a/js/src/i18n/nl/txEditor.js b/js-old/src/i18n/nl/txEditor.js similarity index 100% rename from js/src/i18n/nl/txEditor.js rename to js-old/src/i18n/nl/txEditor.js diff --git a/js/src/i18n/nl/ui.js b/js-old/src/i18n/nl/ui.js similarity index 100% rename from js/src/i18n/nl/ui.js rename to js-old/src/i18n/nl/ui.js diff --git a/js/src/i18n/nl/upgradeParity.js b/js-old/src/i18n/nl/upgradeParity.js similarity index 100% rename from js/src/i18n/nl/upgradeParity.js rename to js-old/src/i18n/nl/upgradeParity.js diff --git a/js/src/i18n/nl/vaults.js b/js-old/src/i18n/nl/vaults.js similarity index 100% rename from js/src/i18n/nl/vaults.js rename to js-old/src/i18n/nl/vaults.js diff --git a/js/src/i18n/nl/verification.js b/js-old/src/i18n/nl/verification.js similarity index 100% rename from js/src/i18n/nl/verification.js rename to js-old/src/i18n/nl/verification.js diff --git a/js/src/i18n/nl/wallet.js b/js-old/src/i18n/nl/wallet.js similarity index 100% rename from js/src/i18n/nl/wallet.js rename to js-old/src/i18n/nl/wallet.js diff --git a/js/src/i18n/nl/walletSettings.js b/js-old/src/i18n/nl/walletSettings.js similarity index 100% rename from js/src/i18n/nl/walletSettings.js rename to js-old/src/i18n/nl/walletSettings.js diff --git a/js/src/i18n/nl/web.js b/js-old/src/i18n/nl/web.js similarity index 100% rename from js/src/i18n/nl/web.js rename to js-old/src/i18n/nl/web.js diff --git a/js/src/i18n/nl/writeContract.js b/js-old/src/i18n/nl/writeContract.js similarity index 100% rename from js/src/i18n/nl/writeContract.js rename to js-old/src/i18n/nl/writeContract.js diff --git a/js-old/src/i18n/store.js b/js-old/src/i18n/store.js new file mode 100644 index 0000000000000000000000000000000000000000..f2506950ec827e3fc987d6ea3160bf175c07257f --- /dev/null +++ b/js-old/src/i18n/store.js @@ -0,0 +1,82 @@ +// 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 . + +import flatten from 'flat'; +import { action, observable, transaction } from 'mobx'; +import { addLocaleData } from 'react-intl'; +import de from 'react-intl/locale-data/de'; +import en from 'react-intl/locale-data/en'; +import nl from 'react-intl/locale-data/nl'; +import zh from 'react-intl/locale-data/zh'; +import store from 'store'; + +import { DEFAULT_LOCALE, DEFAULT_LOCALES, LS_STORE_KEY } from './constants'; +import languages from './languages'; +import deMessages from './de'; +import enMessages from './en'; +import nlMessages from './nl'; +import zhMessages from './zh'; +import zhHantTWMessages from './zh-Hant-TW'; + +let instance = null; + +const LANGUAGES = flatten({ languages }); +const MESSAGES = { + de: Object.assign(flatten(deMessages), LANGUAGES), + en: Object.assign(flatten(enMessages), LANGUAGES), + nl: Object.assign(flatten(nlMessages), LANGUAGES), + zh: Object.assign(flatten(zhMessages), LANGUAGES), + 'zh-Hant-TW': Object.assign(flatten(zhHantTWMessages), LANGUAGES) +}; + +addLocaleData([...de, ...en, ...nl, ...zh]); + +export default class Store { + @observable locale = DEFAULT_LOCALE; + @observable locales = DEFAULT_LOCALES; + @observable messages = MESSAGES[DEFAULT_LOCALE]; + + constructor () { + const savedLocale = store.get(LS_STORE_KEY); + + this.locale = (savedLocale && DEFAULT_LOCALES.includes(savedLocale)) + ? savedLocale + : DEFAULT_LOCALE; + this.messages = MESSAGES[this.locale]; + } + + @action setLocale (locale) { + transaction(() => { + this.locale = locale; + this.messages = MESSAGES[locale]; + + store.set(LS_STORE_KEY, locale); + }); + } + + static get () { + if (!instance) { + instance = new Store(); + } + + return instance; + } +} + +export { + LANGUAGES, + MESSAGES +}; diff --git a/js/src/i18n/store.spec.js b/js-old/src/i18n/store.spec.js similarity index 100% rename from js/src/i18n/store.spec.js rename to js-old/src/i18n/store.spec.js diff --git a/js/src/i18n/zh-Hant-TW/account.js b/js-old/src/i18n/zh-Hant-TW/account.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/account.js rename to js-old/src/i18n/zh-Hant-TW/account.js diff --git a/js/src/i18n/zh-Hant-TW/accounts.js b/js-old/src/i18n/zh-Hant-TW/accounts.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/accounts.js rename to js-old/src/i18n/zh-Hant-TW/accounts.js diff --git a/js/src/i18n/zh-Hant-TW/addAddress.js b/js-old/src/i18n/zh-Hant-TW/addAddress.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/addAddress.js rename to js-old/src/i18n/zh-Hant-TW/addAddress.js diff --git a/js/src/i18n/zh-Hant-TW/addContract.js b/js-old/src/i18n/zh-Hant-TW/addContract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/addContract.js rename to js-old/src/i18n/zh-Hant-TW/addContract.js diff --git a/js/src/i18n/zh-Hant-TW/address.js b/js-old/src/i18n/zh-Hant-TW/address.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/address.js rename to js-old/src/i18n/zh-Hant-TW/address.js diff --git a/js/src/i18n/zh-Hant-TW/addressSelect.js b/js-old/src/i18n/zh-Hant-TW/addressSelect.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/addressSelect.js rename to js-old/src/i18n/zh-Hant-TW/addressSelect.js diff --git a/js/src/i18n/zh-Hant-TW/addresses.js b/js-old/src/i18n/zh-Hant-TW/addresses.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/addresses.js rename to js-old/src/i18n/zh-Hant-TW/addresses.js diff --git a/js/src/i18n/zh-Hant-TW/application.js b/js-old/src/i18n/zh-Hant-TW/application.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/application.js rename to js-old/src/i18n/zh-Hant-TW/application.js diff --git a/js/src/i18n/zh-Hant-TW/connection.js b/js-old/src/i18n/zh-Hant-TW/connection.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/connection.js rename to js-old/src/i18n/zh-Hant-TW/connection.js diff --git a/js/src/i18n/zh-Hant-TW/contract.js b/js-old/src/i18n/zh-Hant-TW/contract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/contract.js rename to js-old/src/i18n/zh-Hant-TW/contract.js diff --git a/js/src/i18n/zh-Hant-TW/contracts.js b/js-old/src/i18n/zh-Hant-TW/contracts.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/contracts.js rename to js-old/src/i18n/zh-Hant-TW/contracts.js diff --git a/js/src/i18n/zh-Hant-TW/createAccount.js b/js-old/src/i18n/zh-Hant-TW/createAccount.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/createAccount.js rename to js-old/src/i18n/zh-Hant-TW/createAccount.js diff --git a/js/src/i18n/zh-Hant-TW/createWallet.js b/js-old/src/i18n/zh-Hant-TW/createWallet.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/createWallet.js rename to js-old/src/i18n/zh-Hant-TW/createWallet.js diff --git a/js/src/i18n/zh-Hant-TW/dapp.js b/js-old/src/i18n/zh-Hant-TW/dapp.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/dapp.js rename to js-old/src/i18n/zh-Hant-TW/dapp.js diff --git a/js/src/i18n/zh-Hant-TW/dapps.js b/js-old/src/i18n/zh-Hant-TW/dapps.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/dapps.js rename to js-old/src/i18n/zh-Hant-TW/dapps.js diff --git a/js/src/i18n/zh-Hant-TW/deleteAccount.js b/js-old/src/i18n/zh-Hant-TW/deleteAccount.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/deleteAccount.js rename to js-old/src/i18n/zh-Hant-TW/deleteAccount.js diff --git a/js/src/i18n/zh-Hant-TW/deployContract.js b/js-old/src/i18n/zh-Hant-TW/deployContract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/deployContract.js rename to js-old/src/i18n/zh-Hant-TW/deployContract.js diff --git a/js/src/i18n/zh/details_windows.js b/js-old/src/i18n/zh-Hant-TW/details_windows.js similarity index 100% rename from js/src/i18n/zh/details_windows.js rename to js-old/src/i18n/zh-Hant-TW/details_windows.js diff --git a/js/src/i18n/zh-Hant-TW/editMeta.js b/js-old/src/i18n/zh-Hant-TW/editMeta.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/editMeta.js rename to js-old/src/i18n/zh-Hant-TW/editMeta.js diff --git a/js/src/i18n/zh-Hant-TW/errors.js b/js-old/src/i18n/zh-Hant-TW/errors.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/errors.js rename to js-old/src/i18n/zh-Hant-TW/errors.js diff --git a/js/src/i18n/zh-Hant-TW/executeContract.js b/js-old/src/i18n/zh-Hant-TW/executeContract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/executeContract.js rename to js-old/src/i18n/zh-Hant-TW/executeContract.js diff --git a/js/src/i18n/zh-Hant-TW/extension.js b/js-old/src/i18n/zh-Hant-TW/extension.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/extension.js rename to js-old/src/i18n/zh-Hant-TW/extension.js diff --git a/js/src/i18n/zh-Hant-TW/faucet.js b/js-old/src/i18n/zh-Hant-TW/faucet.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/faucet.js rename to js-old/src/i18n/zh-Hant-TW/faucet.js diff --git a/js/src/i18n/zh-Hant-TW/firstRun.js b/js-old/src/i18n/zh-Hant-TW/firstRun.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/firstRun.js rename to js-old/src/i18n/zh-Hant-TW/firstRun.js diff --git a/js/src/i18n/zh-Hant-TW/home.js b/js-old/src/i18n/zh-Hant-TW/home.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/home.js rename to js-old/src/i18n/zh-Hant-TW/home.js diff --git a/js/src/i18n/zh-Hant-TW/index.js b/js-old/src/i18n/zh-Hant-TW/index.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/index.js rename to js-old/src/i18n/zh-Hant-TW/index.js diff --git a/js/src/i18n/zh-Hant-TW/loadContract.js b/js-old/src/i18n/zh-Hant-TW/loadContract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/loadContract.js rename to js-old/src/i18n/zh-Hant-TW/loadContract.js diff --git a/js/src/i18n/zh-Hant-TW/parityBar.js b/js-old/src/i18n/zh-Hant-TW/parityBar.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/parityBar.js rename to js-old/src/i18n/zh-Hant-TW/parityBar.js diff --git a/js/src/i18n/zh-Hant-TW/passwordChange.js b/js-old/src/i18n/zh-Hant-TW/passwordChange.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/passwordChange.js rename to js-old/src/i18n/zh-Hant-TW/passwordChange.js diff --git a/js/src/i18n/zh-Hant-TW/saveContract.js b/js-old/src/i18n/zh-Hant-TW/saveContract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/saveContract.js rename to js-old/src/i18n/zh-Hant-TW/saveContract.js diff --git a/js-old/src/i18n/zh-Hant-TW/settings.js b/js-old/src/i18n/zh-Hant-TW/settings.js new file mode 100644 index 0000000000000000000000000000000000000000..8841279dc018f671caf38e6abc151042bcabbede --- /dev/null +++ b/js-old/src/i18n/zh-Hant-TW/settings.js @@ -0,0 +1,126 @@ +// 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 . + +export default { + background: { + button_more: `生成更多`, // generate more + overview_0: `你現在所看到的背景圖案在你的Parity安裝中是獨一無二的。每次創造一個新的Signer令牌都會改變一次圖案。這也保證了去中性化應用不能偽裝成可信的樣子。`, + // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new + // Signer token. This is so that decentralized applications cannot pretend to be trustworthy. + overview_1: `選擇一個你喜歡的圖案並記住它的樣子。這個圖案從現在開始會經常出現，除非你清空了瀏覽器的快取或者使用了新的Signer令牌。`, + // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or + // use a new Signer token. + label: `背景` // background + }, + parity: { + chains: { + chain_classic: `將Parity同步至以太坊經典網路`, // Parity syncs to the Ethereum Classic network + chain_dev: `將Parity使用一條本地開發用區塊鏈`, // Parity uses a local development chain + chain_expanse: `將Parity同步至Expanse網路`, // Parity syncs to the Expanse network + chain_foundation: `將Parity同步至以太坊基金會發起的以太坊網路`, // Parity syncs to the Ethereum network launched by the Ethereum Foundation + chain_kovan: `將Parity同步至Kovan測試網路`, // Parity syncs to the Kovan test network + chain_olympic: `將Parity同步至Olympic測試網路`, // Parity syncs to the Olympic test network + chain_ropsten: `將Parity同步至Ropsten測試網路`, // Parity syncs to the Ropsten test network + cmorden_kovan: `將Parity同步至Morden（經典）測試網路`, // Parity syncs to Morden (Classic) test network + hint: `Parity節點同步的區塊鏈`, // the chain for the Parity node to sync to + label: `將同步的區塊鏈/網路` // chain/network to sync + }, + languages: { + hint: `此介面顯示的語言`, // the language this interface is displayed with + label: `介面語言` // UI language + }, + loglevels: `選擇一個不同的logs層次`, // Choose the different logs level. + modes: { + hint: `Parity節點的同步模式`, // the syncing mode for the Parity node + label: `執行模式`, // mode of operation + mode_active: `Parity持續地同步區塊鏈`, // Parity continuously syncs the chain + mode_dark: `Parity只有在RPC啟用時才同步`, // Parity syncs only when the RPC is active + mode_offline: `Parity不同步`, // Parity doesn't sync + mode_passive: `Parity初始同步，然後進入休眠並有規律地再同步` // Parity syncs initially, then sleeps and wakes regularly to resync + }, + overview_0: `通過此介面控制Parity節點設定和同步設定`, // Control the Parity node settings and nature of syncing via this interface. + label: `parity` // parity + }, + proxy: { + details_0: `除了通過IP地址和埠來訪問Parity，你也能通過.parity子域名來使用Parity，訪問 {homeProxy}。為了設定基於子域名的路由，你需要新增相關的代理記錄至你的瀏覽器。`, + // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting + // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser, + details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`, + // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}. + details_macos: `macOS`, // macOS + details_ubuntu: `Ubuntu`, // Ubuntu + details_windows: `Windows`, // Windows + overview_0: `代理設定使你可以通過一個可記憶的地址來訪問Parity和所有相關的去中性化應用。`, + // The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses. + label: `代理` // proxy + }, + views: { + accounts: { + description: `一個此Parity例項所關聯和匯入的所有帳戶的列表。傳送交易、接收流入價值、管理你的帳目和資助你的帳戶。`, + // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, + // manage your balances and fund your accounts. + label: `帳戶` // Accounts + }, + addresses: { + description: `一個此Parity例項管理的所有聯絡人和地址簿記錄的列表。只需點選一個按鈕就可以觀察帳戶並獲得所有交易相關的資訊。`, + // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available + // at the click of a button when transacting. + label: `地址簿` // Addressbook + }, + apps: { + description: `與整個底層網路交流的分散式應用。新增應用，管理你的應用庫和與網路上的其他應用進行互動。`, + // Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and + // interact with application from around the network. + label: `應用` // Applications + }, + contracts: { + description: `觀察和互動已經被部署在網路上的特定合約。這是一個更注重技術的環境，特別為可以理解合約內部執行機制的高階使用者所設立。`, + // Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, + // specifically for advanced users that understand the inner working of certain contracts. + label: `合約` // Contracts + }, + overview_0: `僅可視部分對你可用的應用來管理應用介面`, + // Manage the available application views using only the parts of the application applicable to you. + overview_1: `你是終端使用者？預設設定為初學者和高階使用者進行了相同的設定。`, + // Are you an end-user? The defaults are setup for both beginner and advanced users alike. + overview_2: `你是開發者？新增一些功能來管理合約和與應用部署互動。`, + // Are you a developer? Add some features to manage contracts and interact with application deployments. + overview_3: `你是礦工或者運營一個大型節點？新增一些功能來讓你獲得更多有關節點執行的資訊。`, + // Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation. + settings: { + description: `此介面。允許你自定義應用的選項、執行、視覺化和感官。`, + // This view. Allows you to customize the application in term of options, operation and look and feel. + label: `設定` // Settings + }, + signer: { + description: `這個應用安全交易管理區域，你可以通過任何從本應用和其他分散式應用發起的即將傳送的交易`, + // The secure transaction management area of the application where you can approve any outgoing transactions made + // from the application as well as those placed into the queue by decentralized applications. + label: `Signer` // Signer + }, + status: { + description: `觀察Parity節點現在的執行情況：網路連線數、實際執行例項的Logs和具體挖礦資訊（如果已開啟並設定）`, + // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance + // and details of mining (if enabled and configured). + label: `狀態` // Status + }, + label: `視窗`, // views + home: { + label: `首頁` // Home + } + }, + label: `設定` // settings +}; diff --git a/js/src/i18n/zh-Hant-TW/shapeshift.js b/js-old/src/i18n/zh-Hant-TW/shapeshift.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/shapeshift.js rename to js-old/src/i18n/zh-Hant-TW/shapeshift.js diff --git a/js/src/i18n/zh-Hant-TW/signer.js b/js-old/src/i18n/zh-Hant-TW/signer.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/signer.js rename to js-old/src/i18n/zh-Hant-TW/signer.js diff --git a/js/src/i18n/zh-Hant-TW/status.js b/js-old/src/i18n/zh-Hant-TW/status.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/status.js rename to js-old/src/i18n/zh-Hant-TW/status.js diff --git a/js/src/i18n/zh-Hant-TW/tabBar.js b/js-old/src/i18n/zh-Hant-TW/tabBar.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/tabBar.js rename to js-old/src/i18n/zh-Hant-TW/tabBar.js diff --git a/js/src/i18n/zh-Hant-TW/transfer.js b/js-old/src/i18n/zh-Hant-TW/transfer.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/transfer.js rename to js-old/src/i18n/zh-Hant-TW/transfer.js diff --git a/js/src/i18n/zh-Hant-TW/txEditor.js b/js-old/src/i18n/zh-Hant-TW/txEditor.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/txEditor.js rename to js-old/src/i18n/zh-Hant-TW/txEditor.js diff --git a/js/src/i18n/zh-Hant-TW/ui.js b/js-old/src/i18n/zh-Hant-TW/ui.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/ui.js rename to js-old/src/i18n/zh-Hant-TW/ui.js diff --git a/js/src/i18n/zh-Hant-TW/upgradeParity.js b/js-old/src/i18n/zh-Hant-TW/upgradeParity.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/upgradeParity.js rename to js-old/src/i18n/zh-Hant-TW/upgradeParity.js diff --git a/js/src/i18n/zh-Hant-TW/vaults.js b/js-old/src/i18n/zh-Hant-TW/vaults.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/vaults.js rename to js-old/src/i18n/zh-Hant-TW/vaults.js diff --git a/js/src/i18n/zh-Hant-TW/verification.js b/js-old/src/i18n/zh-Hant-TW/verification.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/verification.js rename to js-old/src/i18n/zh-Hant-TW/verification.js diff --git a/js/src/i18n/zh-Hant-TW/wallet.js b/js-old/src/i18n/zh-Hant-TW/wallet.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/wallet.js rename to js-old/src/i18n/zh-Hant-TW/wallet.js diff --git a/js/src/i18n/zh-Hant-TW/walletSettings.js b/js-old/src/i18n/zh-Hant-TW/walletSettings.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/walletSettings.js rename to js-old/src/i18n/zh-Hant-TW/walletSettings.js diff --git a/js/src/i18n/zh-Hant-TW/web.js b/js-old/src/i18n/zh-Hant-TW/web.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/web.js rename to js-old/src/i18n/zh-Hant-TW/web.js diff --git a/js/src/i18n/zh-Hant-TW/writeContract.js b/js-old/src/i18n/zh-Hant-TW/writeContract.js similarity index 100% rename from js/src/i18n/zh-Hant-TW/writeContract.js rename to js-old/src/i18n/zh-Hant-TW/writeContract.js diff --git a/js/src/i18n/zh/account.js b/js-old/src/i18n/zh/account.js similarity index 100% rename from js/src/i18n/zh/account.js rename to js-old/src/i18n/zh/account.js diff --git a/js/src/i18n/zh/accounts.js b/js-old/src/i18n/zh/accounts.js similarity index 100% rename from js/src/i18n/zh/accounts.js rename to js-old/src/i18n/zh/accounts.js diff --git a/js/src/i18n/zh/addAddress.js b/js-old/src/i18n/zh/addAddress.js similarity index 100% rename from js/src/i18n/zh/addAddress.js rename to js-old/src/i18n/zh/addAddress.js diff --git a/js/src/i18n/zh/addContract.js b/js-old/src/i18n/zh/addContract.js similarity index 100% rename from js/src/i18n/zh/addContract.js rename to js-old/src/i18n/zh/addContract.js diff --git a/js/src/i18n/zh/address.js b/js-old/src/i18n/zh/address.js similarity index 100% rename from js/src/i18n/zh/address.js rename to js-old/src/i18n/zh/address.js diff --git a/js/src/i18n/zh/addressSelect.js b/js-old/src/i18n/zh/addressSelect.js similarity index 100% rename from js/src/i18n/zh/addressSelect.js rename to js-old/src/i18n/zh/addressSelect.js diff --git a/js/src/i18n/zh/addresses.js b/js-old/src/i18n/zh/addresses.js similarity index 100% rename from js/src/i18n/zh/addresses.js rename to js-old/src/i18n/zh/addresses.js diff --git a/js/src/i18n/zh/application.js b/js-old/src/i18n/zh/application.js similarity index 100% rename from js/src/i18n/zh/application.js rename to js-old/src/i18n/zh/application.js diff --git a/js/src/i18n/zh/connection.js b/js-old/src/i18n/zh/connection.js similarity index 100% rename from js/src/i18n/zh/connection.js rename to js-old/src/i18n/zh/connection.js diff --git a/js/src/i18n/zh/contract.js b/js-old/src/i18n/zh/contract.js similarity index 100% rename from js/src/i18n/zh/contract.js rename to js-old/src/i18n/zh/contract.js diff --git a/js/src/i18n/zh/contracts.js b/js-old/src/i18n/zh/contracts.js similarity index 100% rename from js/src/i18n/zh/contracts.js rename to js-old/src/i18n/zh/contracts.js diff --git a/js/src/i18n/zh/createAccount.js b/js-old/src/i18n/zh/createAccount.js similarity index 100% rename from js/src/i18n/zh/createAccount.js rename to js-old/src/i18n/zh/createAccount.js diff --git a/js/src/i18n/zh/createWallet.js b/js-old/src/i18n/zh/createWallet.js similarity index 100% rename from js/src/i18n/zh/createWallet.js rename to js-old/src/i18n/zh/createWallet.js diff --git a/js/src/i18n/zh/dapp.js b/js-old/src/i18n/zh/dapp.js similarity index 100% rename from js/src/i18n/zh/dapp.js rename to js-old/src/i18n/zh/dapp.js diff --git a/js/src/i18n/zh/dapps.js b/js-old/src/i18n/zh/dapps.js similarity index 100% rename from js/src/i18n/zh/dapps.js rename to js-old/src/i18n/zh/dapps.js diff --git a/js/src/i18n/zh/deleteAccount.js b/js-old/src/i18n/zh/deleteAccount.js similarity index 100% rename from js/src/i18n/zh/deleteAccount.js rename to js-old/src/i18n/zh/deleteAccount.js diff --git a/js/src/i18n/zh/deployContract.js b/js-old/src/i18n/zh/deployContract.js similarity index 100% rename from js/src/i18n/zh/deployContract.js rename to js-old/src/i18n/zh/deployContract.js diff --git a/ethcore/light/src/types/mod.rs.in b/js-old/src/i18n/zh/details_windows.js similarity index 96% rename from ethcore/light/src/types/mod.rs.in rename to js-old/src/i18n/zh/details_windows.js index eba551b533c396d027c868f893165caba2d8315e..fcc5700665db8ae92fc1906d7ac966c2d9783bed 100644 --- a/ethcore/light/src/types/mod.rs.in +++ b/js-old/src/i18n/zh/details_windows.js @@ -14,4 +14,4 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -pub mod request; +export default `Windows`; diff --git a/js/src/i18n/zh/editMeta.js b/js-old/src/i18n/zh/editMeta.js similarity index 100% rename from js/src/i18n/zh/editMeta.js rename to js-old/src/i18n/zh/editMeta.js diff --git a/js/src/i18n/zh/errors.js b/js-old/src/i18n/zh/errors.js similarity index 100% rename from js/src/i18n/zh/errors.js rename to js-old/src/i18n/zh/errors.js diff --git a/js/src/i18n/zh/executeContract.js b/js-old/src/i18n/zh/executeContract.js similarity index 100% rename from js/src/i18n/zh/executeContract.js rename to js-old/src/i18n/zh/executeContract.js diff --git a/js/src/i18n/zh/extension.js b/js-old/src/i18n/zh/extension.js similarity index 100% rename from js/src/i18n/zh/extension.js rename to js-old/src/i18n/zh/extension.js diff --git a/js/src/i18n/zh/faucet.js b/js-old/src/i18n/zh/faucet.js similarity index 100% rename from js/src/i18n/zh/faucet.js rename to js-old/src/i18n/zh/faucet.js diff --git a/js/src/i18n/zh/firstRun.js b/js-old/src/i18n/zh/firstRun.js similarity index 100% rename from js/src/i18n/zh/firstRun.js rename to js-old/src/i18n/zh/firstRun.js diff --git a/js/src/i18n/zh/home.js b/js-old/src/i18n/zh/home.js similarity index 100% rename from js/src/i18n/zh/home.js rename to js-old/src/i18n/zh/home.js diff --git a/js/src/i18n/zh/index.js b/js-old/src/i18n/zh/index.js similarity index 100% rename from js/src/i18n/zh/index.js rename to js-old/src/i18n/zh/index.js diff --git a/js/src/i18n/zh/loadContract.js b/js-old/src/i18n/zh/loadContract.js similarity index 100% rename from js/src/i18n/zh/loadContract.js rename to js-old/src/i18n/zh/loadContract.js diff --git a/js/src/i18n/zh/parityBar.js b/js-old/src/i18n/zh/parityBar.js similarity index 100% rename from js/src/i18n/zh/parityBar.js rename to js-old/src/i18n/zh/parityBar.js diff --git a/js/src/i18n/zh/passwordChange.js b/js-old/src/i18n/zh/passwordChange.js similarity index 100% rename from js/src/i18n/zh/passwordChange.js rename to js-old/src/i18n/zh/passwordChange.js diff --git a/js/src/i18n/zh/saveContract.js b/js-old/src/i18n/zh/saveContract.js similarity index 100% rename from js/src/i18n/zh/saveContract.js rename to js-old/src/i18n/zh/saveContract.js diff --git a/js-old/src/i18n/zh/settings.js b/js-old/src/i18n/zh/settings.js new file mode 100644 index 0000000000000000000000000000000000000000..4081a06d61d2fb6ef3288d4d316201af8ec061ec --- /dev/null +++ b/js-old/src/i18n/zh/settings.js @@ -0,0 +1,126 @@ +// 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 . + +export default { + background: { + button_more: `生成更多`, // generate more + overview_0: `你现在所看到的背景图案在你的Parity安装中是独一无二的。每次创造一个新的Signer令牌都会改变一次图案。这也保证了去中性化应用不能伪装成可信的样子。`, + // The background pattern you can see right now is unique to your Parity installation. It will change every time you create a new + // Signer token. This is so that decentralized applications cannot pretend to be trustworthy. + overview_1: `选择一个你喜欢的图案并记住它的样子。这个图案从现在开始会经常出现，除非你清空了浏览器的缓存或者使用了新的Signer令牌。`, + // Pick a pattern you like and memorize it. This Pattern will always be shown from now on, unless you clear your browser cache or + // use a new Signer token. + label: `背景` // background + }, + parity: { + chains: { + chain_classic: `将Parity同步至以太坊经典网络`, // Parity syncs to the Ethereum Classic network + chain_dev: `将Parity使用一条本地开发用区块链`, // Parity uses a local development chain + chain_expanse: `将Parity同步至Expanse网络`, // Parity syncs to the Expanse network + chain_foundation: `将Parity同步至以太坊基金会发起的以太坊网络`, // Parity syncs to the Ethereum network launched by the Ethereum Foundation + chain_kovan: `将Parity同步至Kovan测试网络`, // Parity syncs to the Kovan test network + chain_olympic: `将Parity同步至Olympic测试网络`, // Parity syncs to the Olympic test network + chain_ropsten: `将Parity同步至Ropsten测试网络`, // Parity syncs to the Ropsten test network + cmorden_kovan: `将Parity同步至Morden（经典）测试网络`, // Parity syncs to Morden (Classic) test network + hint: `Parity节点同步的区块链`, // the chain for the Parity node to sync to + label: `将同步的区块链/网络` // chain/network to sync + }, + languages: { + hint: `此界面显示的语言`, // the language this interface is displayed with + label: `界面语言` // UI language + }, + loglevels: `选择一个不同的logs层次`, // Choose the different logs level. + modes: { + hint: `Parity节点的同步模式`, // the syncing mode for the Parity node + label: `运行模式`, // mode of operation + mode_active: `Parity持续地同步区块链`, // Parity continuously syncs the chain + mode_dark: `Parity只有在RPC激活时才同步`, // Parity syncs only when the RPC is active + mode_offline: `Parity不同步`, // Parity doesn't sync + mode_passive: `Parity初始同步，然后进入休眠并有规律地再同步` // Parity syncs initially, then sleeps and wakes regularly to resync + }, + overview_0: `通过此界面控制Parity节点设置和同步设置`, // Control the Parity node settings and nature of syncing via this interface. + label: `parity` // parity + }, + proxy: { + details_0: `除了通过IP地址和端口来访问Parity，你也能通过.parity子域名来使用Parity，访问 {homeProxy}。为了设置基于子域名的路由，你需要添加相关的代理记录至你的浏览器。`, + // Instead of accessing Parity via the IP address and port, you will be able to access it via the .parity subdomain, by visiting + // {homeProxy}. To setup subdomain-based routing, you need to add the relevant proxy entries to your browser, + details_1: `如果想了解如何配置代理，教程已提供在{windowsLink}，{macOSLink}和{ubuntuLink}。`, + // To learn how to configure the proxy, instructions are provided for {windowsLink}, {macOSLink} or {ubuntuLink}. + details_macos: `macOS`, // macOS + details_ubuntu: `Ubuntu`, // Ubuntu + details_windows: `Windows`, // Windows + overview_0: `代理设置使你可以通过一个可记忆的地址来访问Parity和所有相关的去中性化应用。`, + // The proxy setup allows you to access Parity and all associated decentralized applications via memorable addresses. + label: `代理` // proxy + }, + views: { + accounts: { + description: `一个此Parity实例所关联和导入的所有账户的列表。发送交易、接收流入价值、管理你的账目和资助你的账户。`, + // A list of all the accounts associated with and imported into this Parity instance. Send transactions, receive incoming values, + // manage your balances and fund your accounts. + label: `账户` // Accounts + }, + addresses: { + description: `一个此Parity实例管理的所有联系人和地址簿记录的列表。只需点击一个按钮就可以观察账户并获得所有交易相关的信息。`, + // A list of all contacts and address book entries managed by this Parity instance. Watch accounts and have the details available + // at the click of a button when transacting. + label: `地址簿` // Addressbook + }, + apps: { + description: `与整个底层网络交流的分布式应用。添加应用，管理你的应用库和与网络上的其他应用进行交互。`, + // Decentralized applications that interact with the underlying network. Add applications, manage you application portfolio and + // interact with application from around the network. + label: `应用` // Applications + }, + contracts: { + description: `观察和交互已经被部署在网络上的特定合约。这是一个更注重技术的环境，特别为可以理解合约内部运行机制的高级用户所设立。`, + // Watch and interact with specific contracts that have been deployed on the network. This is a more technically-focused environment, + // specifically for advanced users that understand the inner working of certain contracts. + label: `合约` // Contracts + }, + overview_0: `仅可视部分对你可用的应用来管理应用界面`, + // Manage the available application views using only the parts of the application applicable to you. + overview_1: `你是终端用户？默认设置为初学者和高级用户进行了相同的设置。`, + // Are you an end-user? The defaults are setup for both beginner and advanced users alike. + overview_2: `你是开发者？添加一些功能来管理合约和与应用部署交互。`, + // Are you a developer? Add some features to manage contracts and interact with application deployments. + overview_3: `你是矿工或者运营一个大型节点？添加一些功能来让你获得更多有关节点运行的信息。`, + // Are you a miner or run a large-scale node? Add the features to give you all the information needed to watch the node operation. + settings: { + description: `此界面。允许你自定义应用的选项、运行、可视化和感官。`, + // This view. Allows you to customize the application in term of options, operation and look and feel. + label: `设置` // Settings + }, + signer: { + description: `这个应用安全交易管理区域，你可以通过任何从本应用和其他分布式应用发起的即将发送的交易`, + // The secure transaction management area of the application where you can approve any outgoing transactions made + // from the application as well as those placed into the queue by decentralized applications. + label: `Signer` // Signer + }, + status: { + description: `观察Parity节点现在的运行情况：网络连接数、实际运行实例的Logs和具体挖矿信息（如果已开启并设置）`, + // See how the Parity node is performing in terms of connections to the network, logs from the actual running instance + // and details of mining (if enabled and configured). + label: `状态` // Status + }, + label: `视窗`, // views + home: { + label: `首页` // Home + } + }, + label: `设置` // settings +}; diff --git a/js/src/i18n/zh/shapeshift.js b/js-old/src/i18n/zh/shapeshift.js similarity index 100% rename from js/src/i18n/zh/shapeshift.js rename to js-old/src/i18n/zh/shapeshift.js diff --git a/js/src/i18n/zh/signer.js b/js-old/src/i18n/zh/signer.js similarity index 100% rename from js/src/i18n/zh/signer.js rename to js-old/src/i18n/zh/signer.js diff --git a/js/src/i18n/zh/status.js b/js-old/src/i18n/zh/status.js similarity index 100% rename from js/src/i18n/zh/status.js rename to js-old/src/i18n/zh/status.js diff --git a/js/src/i18n/zh/tabBar.js b/js-old/src/i18n/zh/tabBar.js similarity index 100% rename from js/src/i18n/zh/tabBar.js rename to js-old/src/i18n/zh/tabBar.js diff --git a/js/src/i18n/zh/transfer.js b/js-old/src/i18n/zh/transfer.js similarity index 100% rename from js/src/i18n/zh/transfer.js rename to js-old/src/i18n/zh/transfer.js diff --git a/js/src/i18n/zh/txEditor.js b/js-old/src/i18n/zh/txEditor.js similarity index 100% rename from js/src/i18n/zh/txEditor.js rename to js-old/src/i18n/zh/txEditor.js diff --git a/js/src/i18n/zh/ui.js b/js-old/src/i18n/zh/ui.js similarity index 100% rename from js/src/i18n/zh/ui.js rename to js-old/src/i18n/zh/ui.js diff --git a/js/src/i18n/zh/upgradeParity.js b/js-old/src/i18n/zh/upgradeParity.js similarity index 100% rename from js/src/i18n/zh/upgradeParity.js rename to js-old/src/i18n/zh/upgradeParity.js diff --git a/js/src/i18n/zh/vaults.js b/js-old/src/i18n/zh/vaults.js similarity index 100% rename from js/src/i18n/zh/vaults.js rename to js-old/src/i18n/zh/vaults.js diff --git a/js/src/i18n/zh/verification.js b/js-old/src/i18n/zh/verification.js similarity index 100% rename from js/src/i18n/zh/verification.js rename to js-old/src/i18n/zh/verification.js diff --git a/js/src/i18n/zh/wallet.js b/js-old/src/i18n/zh/wallet.js similarity index 100% rename from js/src/i18n/zh/wallet.js rename to js-old/src/i18n/zh/wallet.js diff --git a/js/src/i18n/zh/walletSettings.js b/js-old/src/i18n/zh/walletSettings.js similarity index 100% rename from js/src/i18n/zh/walletSettings.js rename to js-old/src/i18n/zh/walletSettings.js diff --git a/js/src/i18n/zh/web.js b/js-old/src/i18n/zh/web.js similarity index 100% rename from js/src/i18n/zh/web.js rename to js-old/src/i18n/zh/web.js diff --git a/js/src/i18n/zh/writeContract.js b/js-old/src/i18n/zh/writeContract.js similarity index 100% rename from js/src/i18n/zh/writeContract.js rename to js-old/src/i18n/zh/writeContract.js diff --git a/js/src/index.ejs b/js-old/src/index.ejs similarity index 100% rename from js/src/index.ejs rename to js-old/src/index.ejs diff --git a/js/src/index.js b/js-old/src/index.js similarity index 95% rename from js/src/index.js rename to js-old/src/index.js index 24cf38286f0c29a4a2f6d97c9840bd37be4d584e..7e85dd51f4325934c2e79615f037d2a415c9872b 100644 --- a/js/src/index.js +++ b/js-old/src/index.js @@ -36,6 +36,7 @@ import muiTheme from '~/ui/Theme'; import MainApplication from './main'; import { loadSender, patchApi } from '~/util/tx'; +import { setApi } from '~/redux/providers/apiActions'; import './environment'; @@ -68,6 +69,9 @@ ContractInstances.create(api); const store = initStore(api, hashHistory); +store.dispatch({ type: 'initAll', api }); +store.dispatch(setApi(api)); + window.secureApi = api; ReactDOM.render( diff --git a/js-old/src/inject.js b/js-old/src/inject.js new file mode 100644 index 0000000000000000000000000000000000000000..295a604315739476f4a3a2705ab6e185611b4dfc --- /dev/null +++ b/js-old/src/inject.js @@ -0,0 +1,18 @@ +// 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 . + +import './parity'; +import './web3'; diff --git a/js/src/jsonrpc/.gitignore b/js-old/src/jsonrpc/.gitignore similarity index 100% rename from js/src/jsonrpc/.gitignore rename to js-old/src/jsonrpc/.gitignore diff --git a/js/src/jsonrpc/README.md b/js-old/src/jsonrpc/README.md similarity index 100% rename from js/src/jsonrpc/README.md rename to js-old/src/jsonrpc/README.md diff --git a/js/src/jsonrpc/helpers.js b/js-old/src/jsonrpc/helpers.js similarity index 100% rename from js/src/jsonrpc/helpers.js rename to js-old/src/jsonrpc/helpers.js diff --git a/js/src/jsonrpc/index.js b/js-old/src/jsonrpc/index.js similarity index 100% rename from js/src/jsonrpc/index.js rename to js-old/src/jsonrpc/index.js diff --git a/js/src/jsonrpc/index.spec.js b/js-old/src/jsonrpc/index.spec.js similarity index 100% rename from js/src/jsonrpc/index.spec.js rename to js-old/src/jsonrpc/index.spec.js diff --git a/js/src/jsonrpc/interfaces/db.js b/js-old/src/jsonrpc/interfaces/db.js similarity index 100% rename from js/src/jsonrpc/interfaces/db.js rename to js-old/src/jsonrpc/interfaces/db.js diff --git a/js/src/jsonrpc/interfaces/eth.js b/js-old/src/jsonrpc/interfaces/eth.js similarity index 100% rename from js/src/jsonrpc/interfaces/eth.js rename to js-old/src/jsonrpc/interfaces/eth.js diff --git a/js/src/jsonrpc/interfaces/net.js b/js-old/src/jsonrpc/interfaces/net.js similarity index 100% rename from js/src/jsonrpc/interfaces/net.js rename to js-old/src/jsonrpc/interfaces/net.js diff --git a/js/src/jsonrpc/interfaces/parity.js b/js-old/src/jsonrpc/interfaces/parity.js similarity index 98% rename from js/src/jsonrpc/interfaces/parity.js rename to js-old/src/jsonrpc/interfaces/parity.js index 2dde67b6f6340730c613ac5a9b10baac22fd7ff7..a1e6246e47f8793bc4e3ae214464de5750faa9fe 100644 --- a/js/src/jsonrpc/interfaces/parity.js +++ b/js-old/src/jsonrpc/interfaces/parity.js @@ -56,16 +56,6 @@ export default { } }, - chainId: { - desc: 'Returns the current chain ID used for tranaction signing.', - params: [], - returns: { - type: Quantity, - desc: 'The current blockchain chain ID', - example: '0x1' - } - }, - chainStatus: { section: SECTION_NET, desc: 'Returns the information on warp sync blocks', @@ -370,37 +360,6 @@ export default { } }, - lockedHardwareAccountsInfo: { - desc: 'Provides a list of paths to locked hardware wallets', - params: [], - returns: { - type: Array, - desc: 'Paths of all locked hardware wallets', - example: "['/dev/hidraw0']" - } - }, - - hardwarePinMatrixAck: { - desc: 'Send a pin to a hardware wallet at a specific path to unlock it', - params: [ - { - type: String, - desc: 'path to the device', - example: 'USB_2b24_0001_14100000' - }, - { - type: String, - desc: 'the pin as recieved from the pin matrix', - example: '1234' - } - ], - returns: { - type: Boolean, - desc: 'Whether or not the pin entry successfully unlocked the device', - example: true - } - }, - listOpenedVaults: { desc: 'Returns a list of all opened vaults', params: [], @@ -1756,7 +1715,7 @@ export default { params: [ { type: String, - desc: 'Chain spec name, one of: "foundation", "ropsten", "morden", "kovan", "olympic", "classic", "dev", "expanse", "musicoin" or a filename.', + desc: 'Chain spec name, one of: "foundation", "ropsten", "morden", "kovan", "olympic", "classic", "dev", "expanse" or a filename.', example: 'foundation' } ], diff --git a/js/src/jsonrpc/interfaces/personal.js b/js-old/src/jsonrpc/interfaces/personal.js similarity index 100% rename from js/src/jsonrpc/interfaces/personal.js rename to js-old/src/jsonrpc/interfaces/personal.js diff --git a/js/src/jsonrpc/interfaces/shh.js b/js-old/src/jsonrpc/interfaces/shh.js similarity index 98% rename from js/src/jsonrpc/interfaces/shh.js rename to js-old/src/jsonrpc/interfaces/shh.js index 762029af68cc06ca58c0e4e84b18345426312e16..7084aa3bf22008dbb1b8bc9ee48cfd404a1b7a0e 100644 --- a/js/src/jsonrpc/interfaces/shh.js +++ b/js-old/src/jsonrpc/interfaces/shh.js @@ -163,7 +163,7 @@ export default { ], returns: { type: Data, - desc: '`true` on successful removal, `false` on unknown identity' + desc: '`true` on successful removal, `false` on unkown identity' } }, @@ -285,7 +285,7 @@ export default { }], returns: { type: Boolean, - desc: '`true` on success, `false` on unknown subscription ID.' + desc: '`true` on success, `false` on unkown subscription ID.' } } }; diff --git a/js/src/jsonrpc/interfaces/signer.js b/js-old/src/jsonrpc/interfaces/signer.js similarity index 100% rename from js/src/jsonrpc/interfaces/signer.js rename to js-old/src/jsonrpc/interfaces/signer.js diff --git a/js/src/jsonrpc/interfaces/trace.js b/js-old/src/jsonrpc/interfaces/trace.js similarity index 96% rename from js/src/jsonrpc/interfaces/trace.js rename to js-old/src/jsonrpc/interfaces/trace.js index ce814fdcba2b9578bfc5a5c5261440f4ec808483..9e35da629a314c22860daff7e0738ed384c04818 100644 --- a/js/src/jsonrpc/interfaces/trace.js +++ b/js-old/src/jsonrpc/interfaces/trace.js @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import { Address, BlockNumber, Data, Hash, CallRequest, Quantity } from '../types'; +import { Address, BlockNumber, Data, Hash, CallRequest } from '../types'; import { withPreamble, Dummy, fromDecimal } from '../helpers'; const SECTION_FILTERING = 'Transaction-Trace Filtering'; @@ -134,24 +134,12 @@ then it should look something like: type: Address, desc: 'Sent to these addresses.', optional: true - }, - after: { - type: Quantity, - desc: 'The offset trace number', - optional: true - }, - count: { - type: Quantity, - desc: 'Integer number of traces to display in a batch.', - optional: true } }, example: { fromBlock: fromDecimal(3068100), toBlock: fromDecimal(3068200), - toAddress: ['0x8bbB73BCB5d553B5A556358d27625323Fd781D37'], - after: 1000, - count: 100 + toAddress: ['0x8bbB73BCB5d553B5A556358d27625323Fd781D37'] } } ], diff --git a/js/src/jsonrpc/interfaces/web3.js b/js-old/src/jsonrpc/interfaces/web3.js similarity index 100% rename from js/src/jsonrpc/interfaces/web3.js rename to js-old/src/jsonrpc/interfaces/web3.js diff --git a/js/src/jsonrpc/types.js b/js-old/src/jsonrpc/types.js similarity index 100% rename from js/src/jsonrpc/types.js rename to js-old/src/jsonrpc/types.js diff --git a/ipc/hypervisor/build.rs b/js-old/src/lib.rs similarity index 83% rename from ipc/hypervisor/build.rs rename to js-old/src/lib.rs index 097aba0464ba18220fb5d00c85682199f43c0c5a..04efa7cc51cb54e007dc245ca5aea4b09250ac5c 100644 --- a/ipc/hypervisor/build.rs +++ b/js-old/src/lib.rs @@ -14,8 +14,9 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -extern crate ethcore_ipc_codegen; +#[cfg(feature = "with-syntex")] +include!(concat!(env!("OUT_DIR"), "/lib.rs")); + +#[cfg(not(feature = "with-syntex"))] +include!("lib.rs.in"); -fn main() { - ethcore_ipc_codegen::derive_ipc("src/service.rs.in").unwrap(); -} diff --git a/js-old/src/lib.rs.in b/js-old/src/lib.rs.in new file mode 100644 index 0000000000000000000000000000000000000000..51e3304f436d83de929218597763c74846ac0676 --- /dev/null +++ b/js-old/src/lib.rs.in @@ -0,0 +1,55 @@ +// 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 . + +extern crate parity_dapps_glue; + +use std::collections::HashMap; +use parity_dapps_glue::{WebApp, File, Info}; + +#[derive(WebAppFiles)] +#[webapp(path = "../build")] +pub struct App { + pub files: HashMap<&'static str, File>, +} + +impl Default for App { + fn default() -> App { + App { + files: Self::files(), + } + } +} + +impl WebApp for App { + fn file(&self, path: &str) -> Option<&File> { + self.files.get(path) + } + + fn info(&self) -> Info { + Info { + name: "Parity Wallet v1", + version: env!("CARGO_PKG_VERSION"), + author: "Parity ", + description: "Deprecated version of Parity Wallet.", + icon_url: "icon.png", + } + } +} + +#[test] +fn test_js() { + parity_dapps_glue::js::build(env!("CARGO_MANIFEST_DIR"), "build"); +} diff --git a/js/src/library.etherscan.js b/js-old/src/library.etherscan.js similarity index 100% rename from js/src/library.etherscan.js rename to js-old/src/library.etherscan.js diff --git a/js/src/library.jsonrpc.js b/js-old/src/library.jsonrpc.js similarity index 100% rename from js/src/library.jsonrpc.js rename to js-old/src/library.jsonrpc.js diff --git a/js-old/src/library.parity.js b/js-old/src/library.parity.js new file mode 100644 index 0000000000000000000000000000000000000000..d7d697a8219df9ffb4e7f71929e4f6ecf8f71d8a --- /dev/null +++ b/js-old/src/library.parity.js @@ -0,0 +1,34 @@ +// 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 . + +import es6Promise from 'es6-promise'; +es6Promise.polyfill(); + +const isNode = typeof global !== 'undefined' && typeof global !== 'undefined'; +const isBrowser = typeof self !== 'undefined' && typeof self.window !== 'undefined'; + +if (isBrowser) { + require('whatwg-fetch'); +} + +if (isNode) { + global.fetch = require('node-fetch'); +} + +import Abi from './abi'; +import Api from './api'; + +export { Api, Abi }; diff --git a/js/src/library.shapeshift.js b/js-old/src/library.shapeshift.js similarity index 100% rename from js/src/library.shapeshift.js rename to js-old/src/library.shapeshift.js diff --git a/js/src/main.js b/js-old/src/main.js similarity index 100% rename from js/src/main.js rename to js-old/src/main.js diff --git a/js/src/mobx/hardwareStore.js b/js-old/src/mobx/hardwareStore.js similarity index 65% rename from js/src/mobx/hardwareStore.js rename to js-old/src/mobx/hardwareStore.js index 405853f5a2e2ffbfba6a7b05b61f21ad11b81e1a..46bf3fa58102212826856ae1be4d685b6c5c1cea 100644 --- a/js/src/mobx/hardwareStore.js +++ b/js-old/src/mobx/hardwareStore.js @@ -24,20 +24,13 @@ let instance = null; export default class HardwareStore { @observable isScanning = false; @observable wallets = {}; - @observable pinMatrixRequest = []; constructor (api) { this._api = api; this._ledger = Ledger.create(api); this._pollId = null; - this.hwAccounts = {}; - this.ledgerAccounts = {}; this._pollScan(); - this._subscribeParity(); - this._api.transport.on('close', () => { - this._subscribeParity(); - }); } isConnected (address) { @@ -52,31 +45,12 @@ export default class HardwareStore { this.wallets = wallets; } - @action setPinMatrixRequest = (requests) => { - this.pinMatrixRequest = requests; - } - _pollScan = () => { this._pollId = setTimeout(() => { this.scan().then(this._pollScan); }, HW_SCAN_INTERVAL); } - scanTrezor () { - return this._api.parity - .lockedHardwareAccountsInfo() - .then((paths) => { - this.setPinMatrixRequest(paths.map((path) => { - return { path: path, manufacturer: 'Trezor' }; - })); - return {}; - }) - .catch((err) => { - console.warn('HardwareStore::scanTrezor', err); - return {}; - }); - } - scanLedger () { if (!this._ledger.isSupported) { return Promise.resolve({}); @@ -104,57 +78,48 @@ export default class HardwareStore { }); } - _subscribeParity () { - const onError = error => { - console.warn('HardwareStore::scanParity', error); - - return {}; - }; - - return this._api.pubsub - .subscribeAndGetResult( - callback => this._api.pubsub.parity.hardwareAccountsInfo(callback), - hwInfo => { - Object - .keys(hwInfo) - .forEach((address) => { - const info = hwInfo[address]; - - info.address = address; - info.via = 'parity'; - }); - this.hwAccounts = hwInfo; - this.updateWallets(); - return hwInfo; - }, - onError - ).catch(onError); + scanParity () { + return this._api.parity + .hardwareAccountsInfo() + .then((hwInfo) => { + Object + .keys(hwInfo) + .forEach((address) => { + const info = hwInfo[address]; + + info.address = address; + info.via = 'parity'; + }); + + return hwInfo; + }) + .catch((error) => { + console.warn('HardwareStore::scanParity', error); + + return {}; + }); } scan () { this.setScanning(true); - // This only scans for locked devices and does not return open devices, - // so no need to actually wait for any results here. - this.scanTrezor(); // NOTE: Depending on how the hardware is configured and how the local env setup // 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 // not intended as a network call, i.e. hw wallet is with the user) - return this.scanLedger() - .then((ledgerAccounts) => { - this.ledgerAccounts = ledgerAccounts; + return Promise + .all([ + this.scanParity(), + this.scanLedger() + ]) + .then(([hwAccounts, ledgerAccounts]) => { transaction(() => { - this.updateWallets(); + this.setWallets(Object.assign({}, hwAccounts, ledgerAccounts)); this.setScanning(false); }); }); } - updateWallets () { - this.setWallets(Object.assign({}, this.hwAccounts, this.ledgerAccounts)); - } - createAccountInfo (entry, original = {}) { const { address, manufacturer, name } = entry; @@ -182,15 +147,6 @@ export default class HardwareStore { return this._ledger.signTransaction(transaction); } - pinMatrixAck (device, passcode) { - return this._api.parity - .hardwarePinMatrixAck(device.path, passcode) - .then((success) => { - this.scan(); - return success; - }); - } - static get (api) { if (!instance) { instance = new HardwareStore(api); diff --git a/js/src/mobx/hardwareStore.spec.js b/js-old/src/mobx/hardwareStore.spec.js similarity index 93% rename from js/src/mobx/hardwareStore.spec.js rename to js-old/src/mobx/hardwareStore.spec.js index 7bb979600af966a2983d3e7a4b98c55f16a14cb7..784fc3f104736ae20a8cbba6e91c4e1008c07ede 100644 --- a/js/src/mobx/hardwareStore.spec.js +++ b/js-old/src/mobx/hardwareStore.spec.js @@ -31,15 +31,8 @@ let store; function createApi () { api = { - transport: { - on: sinon.stub() - }, - pubsub: { - subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('not connected'))) - }, parity: { hardwareAccountsInfo: sinon.stub().resolves({ ADDRESS: WALLET }), - lockedHardwareAccountsInfo: sinon.stub().resolves({}), setAccountMeta: sinon.stub().resolves(true), setAccountName: sinon.stub().resolves(true) } @@ -202,11 +195,22 @@ describe('mobx/HardwareStore', () => { }); }); + describe('scanParity', () => { + beforeEach(() => { + return store.scanParity(); + }); + + it('calls parity_hardwareAccountsInfo', () => { + expect(api.parity.hardwareAccountsInfo).to.have.been.called; + }); + }); + describe('scan', () => { beforeEach(() => { sinon.spy(store, 'setScanning'); sinon.spy(store, 'setWallets'); sinon.spy(store, 'scanLedger'); + sinon.spy(store, 'scanParity'); return store.scan(); }); @@ -215,12 +219,17 @@ describe('mobx/HardwareStore', () => { store.setScanning.restore(); store.setWallets.restore(); store.scanLedger.restore(); + store.scanParity.restore(); }); it('calls scanLedger', () => { expect(store.scanLedger).to.have.been.called; }); + it('calls scanParity', () => { + expect(store.scanParity).to.have.been.called; + }); + it('sets and resets the scanning state', () => { expect(store.setScanning).to.have.been.calledWith(true); expect(store.setScanning).to.have.been.calledWith(false); diff --git a/js/src/mobx/historyStore.js b/js-old/src/mobx/historyStore.js similarity index 100% rename from js/src/mobx/historyStore.js rename to js-old/src/mobx/historyStore.js diff --git a/js/src/mobx/historyStore.spec.js b/js-old/src/mobx/historyStore.spec.js similarity index 100% rename from js/src/mobx/historyStore.spec.js rename to js-old/src/mobx/historyStore.spec.js diff --git a/js/src/modals/AddAddress/addAddress.js b/js-old/src/modals/AddAddress/addAddress.js similarity index 100% rename from js/src/modals/AddAddress/addAddress.js rename to js-old/src/modals/AddAddress/addAddress.js diff --git a/js/src/modals/AddAddress/addAddress.spec.js b/js-old/src/modals/AddAddress/addAddress.spec.js similarity index 100% rename from js/src/modals/AddAddress/addAddress.spec.js rename to js-old/src/modals/AddAddress/addAddress.spec.js diff --git a/js/src/modals/AddAddress/index.js b/js-old/src/modals/AddAddress/index.js similarity index 100% rename from js/src/modals/AddAddress/index.js rename to js-old/src/modals/AddAddress/index.js diff --git a/js/src/modals/AddAddress/store.js b/js-old/src/modals/AddAddress/store.js similarity index 100% rename from js/src/modals/AddAddress/store.js rename to js-old/src/modals/AddAddress/store.js diff --git a/js/src/modals/AddAddress/store.spec.js b/js-old/src/modals/AddAddress/store.spec.js similarity index 100% rename from js/src/modals/AddAddress/store.spec.js rename to js-old/src/modals/AddAddress/store.spec.js diff --git a/js/src/modals/AddAddress/store.test.js b/js-old/src/modals/AddAddress/store.test.js similarity index 100% rename from js/src/modals/AddAddress/store.test.js rename to js-old/src/modals/AddAddress/store.test.js diff --git a/js/src/modals/AddContract/addContract.css b/js-old/src/modals/AddContract/addContract.css similarity index 100% rename from js/src/modals/AddContract/addContract.css rename to js-old/src/modals/AddContract/addContract.css diff --git a/js/src/modals/AddContract/addContract.js b/js-old/src/modals/AddContract/addContract.js similarity index 100% rename from js/src/modals/AddContract/addContract.js rename to js-old/src/modals/AddContract/addContract.js diff --git a/js/src/modals/AddContract/addContract.spec.js b/js-old/src/modals/AddContract/addContract.spec.js similarity index 100% rename from js/src/modals/AddContract/addContract.spec.js rename to js-old/src/modals/AddContract/addContract.spec.js diff --git a/js/src/modals/AddContract/addContract.test.js b/js-old/src/modals/AddContract/addContract.test.js similarity index 100% rename from js/src/modals/AddContract/addContract.test.js rename to js-old/src/modals/AddContract/addContract.test.js diff --git a/js/src/modals/AddContract/index.js b/js-old/src/modals/AddContract/index.js similarity index 100% rename from js/src/modals/AddContract/index.js rename to js-old/src/modals/AddContract/index.js diff --git a/js/src/modals/AddContract/store.js b/js-old/src/modals/AddContract/store.js similarity index 100% rename from js/src/modals/AddContract/store.js rename to js-old/src/modals/AddContract/store.js diff --git a/js/src/modals/AddContract/store.spec.js b/js-old/src/modals/AddContract/store.spec.js similarity index 100% rename from js/src/modals/AddContract/store.spec.js rename to js-old/src/modals/AddContract/store.spec.js diff --git a/js/src/modals/AddContract/types.js b/js-old/src/modals/AddContract/types.js similarity index 100% rename from js/src/modals/AddContract/types.js rename to js-old/src/modals/AddContract/types.js diff --git a/js/src/modals/AddDapps/addDapps.css b/js-old/src/modals/AddDapps/addDapps.css similarity index 100% rename from js/src/modals/AddDapps/addDapps.css rename to js-old/src/modals/AddDapps/addDapps.css diff --git a/js/src/modals/AddDapps/addDapps.js b/js-old/src/modals/AddDapps/addDapps.js similarity index 100% rename from js/src/modals/AddDapps/addDapps.js rename to js-old/src/modals/AddDapps/addDapps.js diff --git a/js/src/modals/AddDapps/addDapps.spec.js b/js-old/src/modals/AddDapps/addDapps.spec.js similarity index 100% rename from js/src/modals/AddDapps/addDapps.spec.js rename to js-old/src/modals/AddDapps/addDapps.spec.js diff --git a/js/src/modals/AddDapps/index.js b/js-old/src/modals/AddDapps/index.js similarity index 100% rename from js/src/modals/AddDapps/index.js rename to js-old/src/modals/AddDapps/index.js diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.js b/js-old/src/modals/CreateAccount/AccountDetails/accountDetails.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetails/accountDetails.js rename to js-old/src/modals/CreateAccount/AccountDetails/accountDetails.js diff --git a/js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js b/js-old/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js rename to js-old/src/modals/CreateAccount/AccountDetails/accountDetails.spec.js diff --git a/js/src/modals/CreateAccount/AccountDetails/index.js b/js-old/src/modals/CreateAccount/AccountDetails/index.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetails/index.js rename to js-old/src/modals/CreateAccount/AccountDetails/index.js diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js b/js-old/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js rename to js-old/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.js diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js b/js-old/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js rename to js-old/src/modals/CreateAccount/AccountDetailsGeth/accountDetailsGeth.spec.js diff --git a/js/src/modals/CreateAccount/AccountDetailsGeth/index.js b/js-old/src/modals/CreateAccount/AccountDetailsGeth/index.js similarity index 100% rename from js/src/modals/CreateAccount/AccountDetailsGeth/index.js rename to js-old/src/modals/CreateAccount/AccountDetailsGeth/index.js diff --git a/js/src/modals/CreateAccount/ChangeVault/changeVault.js b/js-old/src/modals/CreateAccount/ChangeVault/changeVault.js similarity index 100% rename from js/src/modals/CreateAccount/ChangeVault/changeVault.js rename to js-old/src/modals/CreateAccount/ChangeVault/changeVault.js diff --git a/js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js b/js-old/src/modals/CreateAccount/ChangeVault/changeVault.spec.js similarity index 100% rename from js/src/modals/CreateAccount/ChangeVault/changeVault.spec.js rename to js-old/src/modals/CreateAccount/ChangeVault/changeVault.spec.js diff --git a/js/src/modals/CreateAccount/ChangeVault/index.js b/js-old/src/modals/CreateAccount/ChangeVault/index.js similarity index 100% rename from js/src/modals/CreateAccount/ChangeVault/index.js rename to js-old/src/modals/CreateAccount/ChangeVault/index.js diff --git a/js/src/modals/CreateAccount/CreationType/creationType.js b/js-old/src/modals/CreateAccount/CreationType/creationType.js similarity index 100% rename from js/src/modals/CreateAccount/CreationType/creationType.js rename to js-old/src/modals/CreateAccount/CreationType/creationType.js diff --git a/js/src/modals/CreateAccount/CreationType/creationType.spec.js b/js-old/src/modals/CreateAccount/CreationType/creationType.spec.js similarity index 100% rename from js/src/modals/CreateAccount/CreationType/creationType.spec.js rename to js-old/src/modals/CreateAccount/CreationType/creationType.spec.js diff --git a/js/src/modals/CreateAccount/CreationType/index.js b/js-old/src/modals/CreateAccount/CreationType/index.js similarity index 100% rename from js/src/modals/CreateAccount/CreationType/index.js rename to js-old/src/modals/CreateAccount/CreationType/index.js diff --git a/js/src/modals/CreateAccount/GethCard/gethCard.js b/js-old/src/modals/CreateAccount/GethCard/gethCard.js similarity index 100% rename from js/src/modals/CreateAccount/GethCard/gethCard.js rename to js-old/src/modals/CreateAccount/GethCard/gethCard.js diff --git a/js/src/modals/CreateAccount/GethCard/index.js b/js-old/src/modals/CreateAccount/GethCard/index.js similarity index 100% rename from js/src/modals/CreateAccount/GethCard/index.js rename to js-old/src/modals/CreateAccount/GethCard/index.js diff --git a/js/src/modals/CreateAccount/NewAccount/index.js b/js-old/src/modals/CreateAccount/NewAccount/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewAccount/index.js rename to js-old/src/modals/CreateAccount/NewAccount/index.js diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js-old/src/modals/CreateAccount/NewAccount/newAccount.js similarity index 100% rename from js/src/modals/CreateAccount/NewAccount/newAccount.js rename to js-old/src/modals/CreateAccount/NewAccount/newAccount.js diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.spec.js b/js-old/src/modals/CreateAccount/NewAccount/newAccount.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewAccount/newAccount.spec.js rename to js-old/src/modals/CreateAccount/NewAccount/newAccount.spec.js diff --git a/js/src/modals/CreateAccount/NewGeth/index.js b/js-old/src/modals/CreateAccount/NewGeth/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewGeth/index.js rename to js-old/src/modals/CreateAccount/NewGeth/index.js diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.js b/js-old/src/modals/CreateAccount/NewGeth/newGeth.js similarity index 100% rename from js/src/modals/CreateAccount/NewGeth/newGeth.js rename to js-old/src/modals/CreateAccount/NewGeth/newGeth.js diff --git a/js/src/modals/CreateAccount/NewGeth/newGeth.spec.js b/js-old/src/modals/CreateAccount/NewGeth/newGeth.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewGeth/newGeth.spec.js rename to js-old/src/modals/CreateAccount/NewGeth/newGeth.spec.js diff --git a/js/src/modals/CreateAccount/NewImport/index.js b/js-old/src/modals/CreateAccount/NewImport/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewImport/index.js rename to js-old/src/modals/CreateAccount/NewImport/index.js diff --git a/js/src/modals/CreateAccount/NewImport/newImport.js b/js-old/src/modals/CreateAccount/NewImport/newImport.js similarity index 100% rename from js/src/modals/CreateAccount/NewImport/newImport.js rename to js-old/src/modals/CreateAccount/NewImport/newImport.js diff --git a/js/src/modals/CreateAccount/NewImport/newImport.spec.js b/js-old/src/modals/CreateAccount/NewImport/newImport.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewImport/newImport.spec.js rename to js-old/src/modals/CreateAccount/NewImport/newImport.spec.js diff --git a/js/src/modals/CreateAccount/NewQr/index.js b/js-old/src/modals/CreateAccount/NewQr/index.js similarity index 100% rename from js/src/modals/CreateAccount/NewQr/index.js rename to js-old/src/modals/CreateAccount/NewQr/index.js diff --git a/js/src/modals/CreateAccount/NewQr/newQr.js b/js-old/src/modals/CreateAccount/NewQr/newQr.js similarity index 100% rename from js/src/modals/CreateAccount/NewQr/newQr.js rename to js-old/src/modals/CreateAccount/NewQr/newQr.js diff --git a/js/src/modals/CreateAccount/NewQr/newQr.spec.js b/js-old/src/modals/CreateAccount/NewQr/newQr.spec.js similarity index 100% rename from js/src/modals/CreateAccount/NewQr/newQr.spec.js rename to js-old/src/modals/CreateAccount/NewQr/newQr.spec.js diff --git a/js/src/modals/CreateAccount/RawKey/index.js b/js-old/src/modals/CreateAccount/RawKey/index.js similarity index 100% rename from js/src/modals/CreateAccount/RawKey/index.js rename to js-old/src/modals/CreateAccount/RawKey/index.js diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js-old/src/modals/CreateAccount/RawKey/rawKey.js similarity index 100% rename from js/src/modals/CreateAccount/RawKey/rawKey.js rename to js-old/src/modals/CreateAccount/RawKey/rawKey.js diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.spec.js b/js-old/src/modals/CreateAccount/RawKey/rawKey.spec.js similarity index 100% rename from js/src/modals/CreateAccount/RawKey/rawKey.spec.js rename to js-old/src/modals/CreateAccount/RawKey/rawKey.spec.js diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/index.js b/js-old/src/modals/CreateAccount/RecoveryPhrase/index.js similarity index 100% rename from js/src/modals/CreateAccount/RecoveryPhrase/index.js rename to js-old/src/modals/CreateAccount/RecoveryPhrase/index.js diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js b/js-old/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js similarity index 100% rename from js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js rename to js-old/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.js diff --git a/js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js b/js-old/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js similarity index 100% rename from js/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js rename to js-old/src/modals/CreateAccount/RecoveryPhrase/recoveryPhrase.spec.js diff --git a/js/src/modals/CreateAccount/TypeIcon/index.js b/js-old/src/modals/CreateAccount/TypeIcon/index.js similarity index 100% rename from js/src/modals/CreateAccount/TypeIcon/index.js rename to js-old/src/modals/CreateAccount/TypeIcon/index.js diff --git a/js/src/modals/CreateAccount/TypeIcon/typeIcon.js b/js-old/src/modals/CreateAccount/TypeIcon/typeIcon.js similarity index 100% rename from js/src/modals/CreateAccount/TypeIcon/typeIcon.js rename to js-old/src/modals/CreateAccount/TypeIcon/typeIcon.js diff --git a/js/src/modals/CreateAccount/createAccount.css b/js-old/src/modals/CreateAccount/createAccount.css similarity index 100% rename from js/src/modals/CreateAccount/createAccount.css rename to js-old/src/modals/CreateAccount/createAccount.css diff --git a/js/src/modals/CreateAccount/createAccount.js b/js-old/src/modals/CreateAccount/createAccount.js similarity index 100% rename from js/src/modals/CreateAccount/createAccount.js rename to js-old/src/modals/CreateAccount/createAccount.js diff --git a/js/src/modals/CreateAccount/createAccount.spec.js b/js-old/src/modals/CreateAccount/createAccount.spec.js similarity index 100% rename from js/src/modals/CreateAccount/createAccount.spec.js rename to js-old/src/modals/CreateAccount/createAccount.spec.js diff --git a/js/src/modals/CreateAccount/createAccount.test.js b/js-old/src/modals/CreateAccount/createAccount.test.js similarity index 100% rename from js/src/modals/CreateAccount/createAccount.test.js rename to js-old/src/modals/CreateAccount/createAccount.test.js diff --git a/js/src/modals/CreateAccount/errors.js b/js-old/src/modals/CreateAccount/errors.js similarity index 100% rename from js/src/modals/CreateAccount/errors.js rename to js-old/src/modals/CreateAccount/errors.js diff --git a/js/src/modals/CreateAccount/index.js b/js-old/src/modals/CreateAccount/index.js similarity index 100% rename from js/src/modals/CreateAccount/index.js rename to js-old/src/modals/CreateAccount/index.js diff --git a/js/src/modals/CreateAccount/print.js b/js-old/src/modals/CreateAccount/print.js similarity index 100% rename from js/src/modals/CreateAccount/print.js rename to js-old/src/modals/CreateAccount/print.js diff --git a/js/src/modals/CreateAccount/recoveryPage.ejs b/js-old/src/modals/CreateAccount/recoveryPage.ejs similarity index 100% rename from js/src/modals/CreateAccount/recoveryPage.ejs rename to js-old/src/modals/CreateAccount/recoveryPage.ejs diff --git a/js/src/modals/CreateAccount/store.js b/js-old/src/modals/CreateAccount/store.js similarity index 99% rename from js/src/modals/CreateAccount/store.js rename to js-old/src/modals/CreateAccount/store.js index cab221f4e4e91575248589343565e82b0a8a0653..cc2160ab95cfc83a413dc18988fd7f234f24288f 100644 --- a/js/src/modals/CreateAccount/store.js +++ b/js-old/src/modals/CreateAccount/store.js @@ -35,7 +35,6 @@ export default class Store { @observable gethAddresses = []; @observable gethImported = []; @observable isBusy = false; - @observable isTest = false; @observable isWindowsPhrase = false; @observable name = ''; @observable nameError = ERRORS.noName; @@ -311,10 +310,6 @@ export default class Store { this.stage--; } - @action setIsTest = isTest => { - this.isTest = isTest; - } - createAccount = (vaultStore) => { if (!this.canCreate) { return false; diff --git a/js/src/modals/CreateAccount/store.spec.js b/js-old/src/modals/CreateAccount/store.spec.js similarity index 100% rename from js/src/modals/CreateAccount/store.spec.js rename to js-old/src/modals/CreateAccount/store.spec.js diff --git a/js/src/modals/CreateWallet/WalletDetails/index.js b/js-old/src/modals/CreateWallet/WalletDetails/index.js similarity index 100% rename from js/src/modals/CreateWallet/WalletDetails/index.js rename to js-old/src/modals/CreateWallet/WalletDetails/index.js diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js b/js-old/src/modals/CreateWallet/WalletDetails/walletDetails.js similarity index 89% rename from js/src/modals/CreateWallet/WalletDetails/walletDetails.js rename to js-old/src/modals/CreateWallet/WalletDetails/walletDetails.js index ee0cc77e23c9a5adb11a0b147d401d23aa21b34e..d3776e2cb4b11a8a4cd4469802a97926b0600715 100644 --- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.js +++ b/js-old/src/modals/CreateWallet/WalletDetails/walletDetails.js @@ -16,21 +16,18 @@ import React, { Component, PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; -import { connect } from 'react-redux'; import { Form, TypedInput, Input, AddressSelect, InputAddress } from '~/ui'; import styles from '../createWallet.css'; -class WalletDetails extends Component { +export default class WalletDetails extends Component { static propTypes = { accounts: PropTypes.object.isRequired, wallet: PropTypes.object.isRequired, errors: PropTypes.object.isRequired, onChange: PropTypes.func.isRequired, - walletType: PropTypes.string.isRequired, - - knownAddresses: PropTypes.array + walletType: PropTypes.string.isRequired }; render () { @@ -106,10 +103,7 @@ class WalletDetails extends Component { } renderMultisigDetails () { - const { accounts, knownAddresses, wallet, errors } = this.props; - const allowedOwners = knownAddresses - // Exclude sender and already owners of the wallet - .filter((address) => !wallet.owners.includes(address) && address !== wallet.account); + const { accounts, wallet, errors } = this.props; return (
@@ -169,7 +163,7 @@ class WalletDetails extends Component { /> ({ - knownAddresses - }); -} - -export default connect( - mapStateToProps, - null -)(WalletDetails); diff --git a/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js b/js-old/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js similarity index 80% rename from js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js rename to js-old/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js index 39bfecc04618b19e0bef8b6bed202bdc0ce4237a..6518e689315aeb25b0e6b0fa2f6f6f886064f45a 100644 --- a/js/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js +++ b/js-old/src/modals/CreateWallet/WalletDetails/walletDetails.spec.js @@ -25,22 +25,6 @@ import { ACCOUNTS } from '../createWallet.test.js'; let component; let onChange; -function createRedux () { - return { - dispatch: sinon.stub(), - subscribe: sinon.stub(), - getState: () => { - return { - personal: { - accounts: {}, - contacts: {}, - contracts: {} - } - }; - } - }; -} - function render (walletType = 'MULTISIG') { onChange = sinon.stub(); component = shallow( @@ -52,12 +36,7 @@ function render (walletType = 'MULTISIG') { owners: [] } } walletType={ walletType } - />, - { - context: { - store: createRedux() - } - } + /> ); return component; diff --git a/js/src/modals/CreateWallet/WalletInfo/index.js b/js-old/src/modals/CreateWallet/WalletInfo/index.js similarity index 100% rename from js/src/modals/CreateWallet/WalletInfo/index.js rename to js-old/src/modals/CreateWallet/WalletInfo/index.js diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.js b/js-old/src/modals/CreateWallet/WalletInfo/walletInfo.js similarity index 100% rename from js/src/modals/CreateWallet/WalletInfo/walletInfo.js rename to js-old/src/modals/CreateWallet/WalletInfo/walletInfo.js diff --git a/js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js b/js-old/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js similarity index 100% rename from js/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js rename to js-old/src/modals/CreateWallet/WalletInfo/walletInfo.spec.js diff --git a/js/src/modals/CreateWallet/WalletType/index.js b/js-old/src/modals/CreateWallet/WalletType/index.js similarity index 100% rename from js/src/modals/CreateWallet/WalletType/index.js rename to js-old/src/modals/CreateWallet/WalletType/index.js diff --git a/js/src/modals/CreateWallet/WalletType/walletType.js b/js-old/src/modals/CreateWallet/WalletType/walletType.js similarity index 100% rename from js/src/modals/CreateWallet/WalletType/walletType.js rename to js-old/src/modals/CreateWallet/WalletType/walletType.js diff --git a/js/src/modals/CreateWallet/WalletType/walletType.spec.js b/js-old/src/modals/CreateWallet/WalletType/walletType.spec.js similarity index 100% rename from js/src/modals/CreateWallet/WalletType/walletType.spec.js rename to js-old/src/modals/CreateWallet/WalletType/walletType.spec.js diff --git a/js/src/modals/CreateWallet/createWallet.css b/js-old/src/modals/CreateWallet/createWallet.css similarity index 100% rename from js/src/modals/CreateWallet/createWallet.css rename to js-old/src/modals/CreateWallet/createWallet.css diff --git a/js/src/modals/CreateWallet/createWallet.js b/js-old/src/modals/CreateWallet/createWallet.js similarity index 100% rename from js/src/modals/CreateWallet/createWallet.js rename to js-old/src/modals/CreateWallet/createWallet.js diff --git a/js/src/modals/CreateWallet/createWallet.spec.js b/js-old/src/modals/CreateWallet/createWallet.spec.js similarity index 100% rename from js/src/modals/CreateWallet/createWallet.spec.js rename to js-old/src/modals/CreateWallet/createWallet.spec.js diff --git a/js/src/modals/CreateWallet/createWallet.test.js b/js-old/src/modals/CreateWallet/createWallet.test.js similarity index 100% rename from js/src/modals/CreateWallet/createWallet.test.js rename to js-old/src/modals/CreateWallet/createWallet.test.js diff --git a/js/src/modals/CreateWallet/createWalletStore.js b/js-old/src/modals/CreateWallet/createWalletStore.js similarity index 96% rename from js/src/modals/CreateWallet/createWalletStore.js rename to js-old/src/modals/CreateWallet/createWalletStore.js index 75f34d269a0f2c2aa1e9bb555bffac36576ee001..26ed5816cf3763a478e91149238d7197ad6d0508 100644 --- a/js/src/modals/CreateWallet/createWalletStore.js +++ b/js-old/src/modals/CreateWallet/createWalletStore.js @@ -281,13 +281,6 @@ export default class CreateWalletStore { const daylimitValidation = validateUint(_wallet.daylimit); const nameValidation = validateName(_wallet.name); - const owners = _wallet.owners.filter((owner) => !/^(0x)?0*$/.test(owner)); - - // Real number of owners is owners + creator - if (_wallet.required > owners.length + 1) { - requiredValidation.valueError = 'the number of required validators should be lower or equal the number of owners'; - } - const errors = { address: addressValidation.addressError, account: accountValidation.addressError, diff --git a/js/src/modals/CreateWallet/index.js b/js-old/src/modals/CreateWallet/index.js similarity index 100% rename from js/src/modals/CreateWallet/index.js rename to js-old/src/modals/CreateWallet/index.js diff --git a/js/src/modals/DappPermissions/dappPermissions.js b/js-old/src/modals/DappPermissions/dappPermissions.js similarity index 100% rename from js/src/modals/DappPermissions/dappPermissions.js rename to js-old/src/modals/DappPermissions/dappPermissions.js diff --git a/js/src/modals/DappPermissions/dappPermissions.spec.js b/js-old/src/modals/DappPermissions/dappPermissions.spec.js similarity index 100% rename from js/src/modals/DappPermissions/dappPermissions.spec.js rename to js-old/src/modals/DappPermissions/dappPermissions.spec.js diff --git a/js/src/modals/DappPermissions/index.js b/js-old/src/modals/DappPermissions/index.js similarity index 100% rename from js/src/modals/DappPermissions/index.js rename to js-old/src/modals/DappPermissions/index.js diff --git a/js/src/modals/DappPermissions/store.js b/js-old/src/modals/DappPermissions/store.js similarity index 100% rename from js/src/modals/DappPermissions/store.js rename to js-old/src/modals/DappPermissions/store.js diff --git a/js/src/modals/DappPermissions/store.spec.js b/js-old/src/modals/DappPermissions/store.spec.js similarity index 100% rename from js/src/modals/DappPermissions/store.spec.js rename to js-old/src/modals/DappPermissions/store.spec.js diff --git a/js/src/modals/DeleteAccount/deleteAccount.css b/js-old/src/modals/DeleteAccount/deleteAccount.css similarity index 100% rename from js/src/modals/DeleteAccount/deleteAccount.css rename to js-old/src/modals/DeleteAccount/deleteAccount.css diff --git a/js/src/modals/DeleteAccount/deleteAccount.js b/js-old/src/modals/DeleteAccount/deleteAccount.js similarity index 100% rename from js/src/modals/DeleteAccount/deleteAccount.js rename to js-old/src/modals/DeleteAccount/deleteAccount.js diff --git a/js/src/modals/DeleteAccount/deleteAccount.spec.js b/js-old/src/modals/DeleteAccount/deleteAccount.spec.js similarity index 100% rename from js/src/modals/DeleteAccount/deleteAccount.spec.js rename to js-old/src/modals/DeleteAccount/deleteAccount.spec.js diff --git a/js/src/modals/DeleteAccount/index.js b/js-old/src/modals/DeleteAccount/index.js similarity index 100% rename from js/src/modals/DeleteAccount/index.js rename to js-old/src/modals/DeleteAccount/index.js diff --git a/js/src/modals/DeployContract/DetailsStep/detailsStep.js b/js-old/src/modals/DeployContract/DetailsStep/detailsStep.js similarity index 100% rename from js/src/modals/DeployContract/DetailsStep/detailsStep.js rename to js-old/src/modals/DeployContract/DetailsStep/detailsStep.js diff --git a/js/src/modals/DeployContract/DetailsStep/index.js b/js-old/src/modals/DeployContract/DetailsStep/index.js similarity index 100% rename from js/src/modals/DeployContract/DetailsStep/index.js rename to js-old/src/modals/DeployContract/DetailsStep/index.js diff --git a/js/src/modals/DeployContract/ParametersStep/index.js b/js-old/src/modals/DeployContract/ParametersStep/index.js similarity index 100% rename from js/src/modals/DeployContract/ParametersStep/index.js rename to js-old/src/modals/DeployContract/ParametersStep/index.js diff --git a/js/src/modals/DeployContract/ParametersStep/parametersStep.js b/js-old/src/modals/DeployContract/ParametersStep/parametersStep.js similarity index 96% rename from js/src/modals/DeployContract/ParametersStep/parametersStep.js rename to js-old/src/modals/DeployContract/ParametersStep/parametersStep.js index e6d0bc7317da949f5ab91414d6b280f7a8f142d7..0213bfa013856463dab0ca692f653dd35c8538fc 100644 --- a/js/src/modals/DeployContract/ParametersStep/parametersStep.js +++ b/js-old/src/modals/DeployContract/ParametersStep/parametersStep.js @@ -43,6 +43,7 @@ export default class ParametersStep extends Component { }; static propTypes = { + accounts: PropTypes.object.isRequired, onParamsChange: PropTypes.func.isRequired, inputs: PropTypes.array, @@ -59,7 +60,7 @@ export default class ParametersStep extends Component { } renderConstructorInputs () { - const { params, paramsError } = this.props; + const { accounts, params, paramsError } = this.props; const { inputs } = this.props; if (!inputs || !inputs.length) { @@ -77,6 +78,7 @@ export default class ParametersStep extends Component { return (
@@ -331,7 +331,6 @@ class DeployContract extends Component { return ( - +
); } diff --git a/js/src/modals/ExecuteContract/AdvancedStep/index.js b/js-old/src/modals/ExecuteContract/AdvancedStep/index.js similarity index 100% rename from js/src/modals/ExecuteContract/AdvancedStep/index.js rename to js-old/src/modals/ExecuteContract/AdvancedStep/index.js diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js b/js-old/src/modals/ExecuteContract/DetailsStep/detailsStep.js similarity index 98% rename from js/src/modals/ExecuteContract/DetailsStep/detailsStep.js rename to js-old/src/modals/ExecuteContract/DetailsStep/detailsStep.js index ecbcbed265bde32f85da26dfc1151783e595a8ae..913def0eeffa017adaf2c4a92c735804dbc1b67a 100644 --- a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.js +++ b/js-old/src/modals/ExecuteContract/DetailsStep/detailsStep.js @@ -177,7 +177,7 @@ export default class DetailsStep extends Component { } renderParameters () { - const { func, values, valuesError, onValueChange } = this.props; + const { accounts, func, values, valuesError, onValueChange } = this.props; if (!func) { return null; @@ -197,6 +197,7 @@ export default class DetailsStep extends Component { value={ values[index] } error={ valuesError[index] } onChange={ onChange } + accounts={ accounts } param={ input.type } isEth={ false } /> diff --git a/js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js b/js-old/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js similarity index 100% rename from js/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js rename to js-old/src/modals/ExecuteContract/DetailsStep/detailsStep.spec.js diff --git a/js/src/modals/ExecuteContract/DetailsStep/index.js b/js-old/src/modals/ExecuteContract/DetailsStep/index.js similarity index 100% rename from js/src/modals/ExecuteContract/DetailsStep/index.js rename to js-old/src/modals/ExecuteContract/DetailsStep/index.js diff --git a/js/src/modals/ExecuteContract/executeContract.css b/js-old/src/modals/ExecuteContract/executeContract.css similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.css rename to js-old/src/modals/ExecuteContract/executeContract.css diff --git a/js/src/modals/ExecuteContract/executeContract.js b/js-old/src/modals/ExecuteContract/executeContract.js similarity index 95% rename from js/src/modals/ExecuteContract/executeContract.js rename to js-old/src/modals/ExecuteContract/executeContract.js index 0dfa7c92ef4caed08fcafcf7022eb29ebf6101d4..0f648dece5c96ad435a5cf73d34ec59cf21cd084 100644 --- a/js/src/modals/ExecuteContract/executeContract.js +++ b/js-old/src/modals/ExecuteContract/executeContract.js @@ -57,7 +57,6 @@ class ExecuteContract extends Component { }; static propTypes = { - availability: PropTypes.string.isRequired, accounts: PropTypes.object, contract: PropTypes.object.isRequired, fromAddress: PropTypes.string, @@ -199,7 +198,7 @@ class ExecuteContract extends Component { } renderStep () { - const { availability, accounts, contract, fromAddress, onFromAddressChange } = this.props; + const { accounts, contract, fromAddress, onFromAddressChange } = this.props; const { step } = this.state; if (step === STEP_DETAILS) { @@ -219,10 +218,7 @@ class ExecuteContract extends Component { } return ( - + ); } @@ -341,10 +337,9 @@ class ExecuteContract extends Component { } function mapStateToProps (state) { - const { gasLimit, nodeKind = {} } = state.nodeStatus; - const { availability = 'unknown' } = nodeKind; + const { gasLimit } = state.nodeStatus; - return { availability, gasLimit }; + return { gasLimit }; } export default connect( diff --git a/js/src/modals/ExecuteContract/executeContract.spec.js b/js-old/src/modals/ExecuteContract/executeContract.spec.js similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.spec.js rename to js-old/src/modals/ExecuteContract/executeContract.spec.js diff --git a/js/src/modals/ExecuteContract/executeContract.test.js b/js-old/src/modals/ExecuteContract/executeContract.test.js similarity index 100% rename from js/src/modals/ExecuteContract/executeContract.test.js rename to js-old/src/modals/ExecuteContract/executeContract.test.js diff --git a/js/src/modals/ExecuteContract/index.js b/js-old/src/modals/ExecuteContract/index.js similarity index 100% rename from js/src/modals/ExecuteContract/index.js rename to js-old/src/modals/ExecuteContract/index.js diff --git a/js/src/modals/ExportAccount/exportAccount.js b/js-old/src/modals/ExportAccount/exportAccount.js similarity index 96% rename from js/src/modals/ExportAccount/exportAccount.js rename to js-old/src/modals/ExportAccount/exportAccount.js index eddd23cd64bafc0b239166efc380e58a10552e43..48faaaec36e722788dd7a51ed914710cdc521d04 100644 --- a/js/src/modals/ExportAccount/exportAccount.js +++ b/js-old/src/modals/ExportAccount/exportAccount.js @@ -58,7 +58,7 @@ class ExportAccount extends Component { key='cancel' label={ } @@ -70,7 +70,7 @@ class ExportAccount extends Component { key='execute' label={ } @@ -81,7 +81,7 @@ class ExportAccount extends Component { open title={ } diff --git a/js/src/modals/ExportAccount/exportAccount.spec.js b/js-old/src/modals/ExportAccount/exportAccount.spec.js similarity index 100% rename from js/src/modals/ExportAccount/exportAccount.spec.js rename to js-old/src/modals/ExportAccount/exportAccount.spec.js diff --git a/js/src/modals/ExportAccount/exportInput/exportInput.js b/js-old/src/modals/ExportAccount/exportInput/exportInput.js similarity index 94% rename from js/src/modals/ExportAccount/exportInput/exportInput.js rename to js-old/src/modals/ExportAccount/exportInput/exportInput.js index 619166addaea4bbeb61fb573cf38022336374eff..07673b29b1c1562bba25e29393ab9465547202c9 100644 --- a/js/src/modals/ExportAccount/exportInput/exportInput.js +++ b/js-old/src/modals/ExportAccount/exportInput/exportInput.js @@ -34,13 +34,13 @@ export default class ExportInput extends Component { type='password' label={ } hint={ } diff --git a/js/src/modals/ExportAccount/exportInput/index.js b/js-old/src/modals/ExportAccount/exportInput/index.js similarity index 100% rename from js/src/modals/ExportAccount/exportInput/index.js rename to js-old/src/modals/ExportAccount/exportInput/index.js diff --git a/js/src/modals/ExportAccount/exportStore.js b/js-old/src/modals/ExportAccount/exportStore.js similarity index 100% rename from js/src/modals/ExportAccount/exportStore.js rename to js-old/src/modals/ExportAccount/exportStore.js diff --git a/js/src/modals/ExportAccount/exportStore.spec.js b/js-old/src/modals/ExportAccount/exportStore.spec.js similarity index 100% rename from js/src/modals/ExportAccount/exportStore.spec.js rename to js-old/src/modals/ExportAccount/exportStore.spec.js diff --git a/js/src/modals/ExportAccount/index.js b/js-old/src/modals/ExportAccount/index.js similarity index 100% rename from js/src/modals/ExportAccount/index.js rename to js-old/src/modals/ExportAccount/index.js diff --git a/js/src/modals/Faucet/faucet.js b/js-old/src/modals/Faucet/faucet.js similarity index 100% rename from js/src/modals/Faucet/faucet.js rename to js-old/src/modals/Faucet/faucet.js diff --git a/js/src/modals/Faucet/index.js b/js-old/src/modals/Faucet/index.js similarity index 100% rename from js/src/modals/Faucet/index.js rename to js-old/src/modals/Faucet/index.js diff --git a/js/src/modals/Faucet/store.js b/js-old/src/modals/Faucet/store.js similarity index 100% rename from js/src/modals/Faucet/store.js rename to js-old/src/modals/Faucet/store.js diff --git a/js/src/modals/FirstRun/Completed/completed.js b/js-old/src/modals/FirstRun/Completed/completed.js similarity index 100% rename from js/src/modals/FirstRun/Completed/completed.js rename to js-old/src/modals/FirstRun/Completed/completed.js diff --git a/js/src/modals/FirstRun/Completed/index.js b/js-old/src/modals/FirstRun/Completed/index.js similarity index 100% rename from js/src/modals/FirstRun/Completed/index.js rename to js-old/src/modals/FirstRun/Completed/index.js diff --git a/js/src/modals/FirstRun/TnC/index.js b/js-old/src/modals/FirstRun/TnC/index.js similarity index 100% rename from js/src/modals/FirstRun/TnC/index.js rename to js-old/src/modals/FirstRun/TnC/index.js diff --git a/js/src/modals/FirstRun/TnC/tnc.js b/js-old/src/modals/FirstRun/TnC/tnc.js similarity index 100% rename from js/src/modals/FirstRun/TnC/tnc.js rename to js-old/src/modals/FirstRun/TnC/tnc.js diff --git a/js/src/modals/FirstRun/TnC/tnc.md b/js-old/src/modals/FirstRun/TnC/tnc.md similarity index 100% rename from js/src/modals/FirstRun/TnC/tnc.md rename to js-old/src/modals/FirstRun/TnC/tnc.md diff --git a/js/src/modals/FirstRun/Welcome/index.js b/js-old/src/modals/FirstRun/Welcome/index.js similarity index 100% rename from js/src/modals/FirstRun/Welcome/index.js rename to js-old/src/modals/FirstRun/Welcome/index.js diff --git a/js/src/modals/FirstRun/Welcome/welcome.js b/js-old/src/modals/FirstRun/Welcome/welcome.js similarity index 100% rename from js/src/modals/FirstRun/Welcome/welcome.js rename to js-old/src/modals/FirstRun/Welcome/welcome.js diff --git a/js/src/modals/FirstRun/firstRun.css b/js-old/src/modals/FirstRun/firstRun.css similarity index 100% rename from js/src/modals/FirstRun/firstRun.css rename to js-old/src/modals/FirstRun/firstRun.css diff --git a/js/src/modals/FirstRun/firstRun.js b/js-old/src/modals/FirstRun/firstRun.js similarity index 95% rename from js/src/modals/FirstRun/firstRun.js rename to js-old/src/modals/FirstRun/firstRun.js index ea91fa83db7695a2cc4e822ce259625e87224f0a..2db94fdb9b6d4b224f0887eb5556969cdb1de699 100644 --- a/js/src/modals/FirstRun/firstRun.js +++ b/js-old/src/modals/FirstRun/firstRun.js @@ -78,23 +78,16 @@ class FirstRun extends Component { hasAccounts: PropTypes.bool.isRequired, newError: PropTypes.func.isRequired, onClose: PropTypes.func.isRequired, - visible: PropTypes.bool.isRequired, - isTest: PropTypes.bool.isRequired + visible: PropTypes.bool.isRequired } - createStore = new CreateStore(this.context.api, {}, this.props.isTest, false); + createStore = new CreateStore(this.context.api, {}, true, false); state = { stage: 0, hasAcceptedTnc: false } - componentWillReceiveProps (nextProps) { - if (nextProps.isTest !== this.props.isTest) { - this.createStore.setIsTest(nextProps.isTest); - } - } - render () { const { visible } = this.props; const { stage } = this.state; @@ -355,10 +348,9 @@ class FirstRun extends Component { function mapStateToProps (state) { const { hasAccounts } = state.personal; - const { isTest } = state.nodeStatus; return { - hasAccounts, isTest + hasAccounts }; } diff --git a/js-old/src/modals/FirstRun/firstRun.spec.js b/js-old/src/modals/FirstRun/firstRun.spec.js new file mode 100644 index 0000000000000000000000000000000000000000..14707dd5cafbe0e77fee8a70d37336a9acf88fe2 --- /dev/null +++ b/js-old/src/modals/FirstRun/firstRun.spec.js @@ -0,0 +1,69 @@ +// 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 . + +import { shallow } from 'enzyme'; +import React from 'react'; +import sinon from 'sinon'; + +import FirstRun from './'; + +let component; +let onClose; + +function createApi () { + return {}; +} + +function createRedux () { + return { + dispatch: sinon.stub(), + subscribe: sinon.stub(), + getState: () => { + return { + personal: { + hasAccounts: false + } + }; + } + }; +} + +function render (props = { visible: true }) { + onClose = sinon.stub(); + component = shallow( + , + { + context: { + store: createRedux() + } + } + ).find('FirstRun').shallow({ + context: { + api: createApi() + } + }); + + return component; +} + +describe('modals/FirstRun', () => { + it('renders defaults', () => { + expect(render()).to.be.ok; + }); +}); diff --git a/js/src/modals/FirstRun/index.js b/js-old/src/modals/FirstRun/index.js similarity index 100% rename from js/src/modals/FirstRun/index.js rename to js-old/src/modals/FirstRun/index.js diff --git a/js/src/modals/LoadContract/index.js b/js-old/src/modals/LoadContract/index.js similarity index 100% rename from js/src/modals/LoadContract/index.js rename to js-old/src/modals/LoadContract/index.js diff --git a/js/src/modals/LoadContract/loadContract.css b/js-old/src/modals/LoadContract/loadContract.css similarity index 100% rename from js/src/modals/LoadContract/loadContract.css rename to js-old/src/modals/LoadContract/loadContract.css diff --git a/js/src/modals/LoadContract/loadContract.js b/js-old/src/modals/LoadContract/loadContract.js similarity index 100% rename from js/src/modals/LoadContract/loadContract.js rename to js-old/src/modals/LoadContract/loadContract.js diff --git a/js/src/modals/LoadContract/loadContract.spec.js b/js-old/src/modals/LoadContract/loadContract.spec.js similarity index 100% rename from js/src/modals/LoadContract/loadContract.spec.js rename to js-old/src/modals/LoadContract/loadContract.spec.js diff --git a/js/src/modals/PasswordManager/index.js b/js-old/src/modals/PasswordManager/index.js similarity index 100% rename from js/src/modals/PasswordManager/index.js rename to js-old/src/modals/PasswordManager/index.js diff --git a/js/src/modals/PasswordManager/passwordManager.css b/js-old/src/modals/PasswordManager/passwordManager.css similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.css rename to js-old/src/modals/PasswordManager/passwordManager.css diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js-old/src/modals/PasswordManager/passwordManager.js similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.js rename to js-old/src/modals/PasswordManager/passwordManager.js diff --git a/js/src/modals/PasswordManager/passwordManager.spec.js b/js-old/src/modals/PasswordManager/passwordManager.spec.js similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.spec.js rename to js-old/src/modals/PasswordManager/passwordManager.spec.js diff --git a/js/src/modals/PasswordManager/passwordManager.test.js b/js-old/src/modals/PasswordManager/passwordManager.test.js similarity index 100% rename from js/src/modals/PasswordManager/passwordManager.test.js rename to js-old/src/modals/PasswordManager/passwordManager.test.js diff --git a/js/src/modals/PasswordManager/store.js b/js-old/src/modals/PasswordManager/store.js similarity index 100% rename from js/src/modals/PasswordManager/store.js rename to js-old/src/modals/PasswordManager/store.js diff --git a/js/src/modals/PasswordManager/store.spec.js b/js-old/src/modals/PasswordManager/store.spec.js similarity index 100% rename from js/src/modals/PasswordManager/store.spec.js rename to js-old/src/modals/PasswordManager/store.spec.js diff --git a/js/src/modals/SaveContract/index.js b/js-old/src/modals/SaveContract/index.js similarity index 100% rename from js/src/modals/SaveContract/index.js rename to js-old/src/modals/SaveContract/index.js diff --git a/js/src/modals/SaveContract/saveContract.css b/js-old/src/modals/SaveContract/saveContract.css similarity index 100% rename from js/src/modals/SaveContract/saveContract.css rename to js-old/src/modals/SaveContract/saveContract.css diff --git a/js/src/modals/SaveContract/saveContract.js b/js-old/src/modals/SaveContract/saveContract.js similarity index 100% rename from js/src/modals/SaveContract/saveContract.js rename to js-old/src/modals/SaveContract/saveContract.js diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js b/js-old/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js rename to js-old/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.js diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js b/js-old/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js rename to js-old/src/modals/Shapeshift/AwaitingDepositStep/awaitingDepositStep.spec.js diff --git a/js/src/modals/Shapeshift/AwaitingDepositStep/index.js b/js-old/src/modals/Shapeshift/AwaitingDepositStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingDepositStep/index.js rename to js-old/src/modals/Shapeshift/AwaitingDepositStep/index.js diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js b/js-old/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js rename to js-old/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.js diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js b/js-old/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js rename to js-old/src/modals/Shapeshift/AwaitingExchangeStep/awaitingExchangeStep.spec.js diff --git a/js/src/modals/Shapeshift/AwaitingExchangeStep/index.js b/js-old/src/modals/Shapeshift/AwaitingExchangeStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/AwaitingExchangeStep/index.js rename to js-old/src/modals/Shapeshift/AwaitingExchangeStep/index.js diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.js b/js-old/src/modals/Shapeshift/CompletedStep/completedStep.js similarity index 100% rename from js/src/modals/Shapeshift/CompletedStep/completedStep.js rename to js-old/src/modals/Shapeshift/CompletedStep/completedStep.js diff --git a/js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js b/js-old/src/modals/Shapeshift/CompletedStep/completedStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/CompletedStep/completedStep.spec.js rename to js-old/src/modals/Shapeshift/CompletedStep/completedStep.spec.js diff --git a/js/src/modals/Shapeshift/CompletedStep/index.js b/js-old/src/modals/Shapeshift/CompletedStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/CompletedStep/index.js rename to js-old/src/modals/Shapeshift/CompletedStep/index.js diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.js b/js-old/src/modals/Shapeshift/ErrorStep/errorStep.js similarity index 100% rename from js/src/modals/Shapeshift/ErrorStep/errorStep.js rename to js-old/src/modals/Shapeshift/ErrorStep/errorStep.js diff --git a/js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js b/js-old/src/modals/Shapeshift/ErrorStep/errorStep.spec.js similarity index 100% rename from js/src/modals/Shapeshift/ErrorStep/errorStep.spec.js rename to js-old/src/modals/Shapeshift/ErrorStep/errorStep.spec.js diff --git a/js/src/modals/Shapeshift/ErrorStep/index.js b/js-old/src/modals/Shapeshift/ErrorStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/ErrorStep/index.js rename to js-old/src/modals/Shapeshift/ErrorStep/index.js diff --git a/js/src/modals/Shapeshift/OptionsStep/index.js b/js-old/src/modals/Shapeshift/OptionsStep/index.js similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/index.js rename to js-old/src/modals/Shapeshift/OptionsStep/index.js diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.css b/js-old/src/modals/Shapeshift/OptionsStep/optionsStep.css similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/optionsStep.css rename to js-old/src/modals/Shapeshift/OptionsStep/optionsStep.css diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsStep.js b/js-old/src/modals/Shapeshift/OptionsStep/optionsStep.js similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/optionsStep.js rename to js-old/src/modals/Shapeshift/OptionsStep/optionsStep.js diff --git a/js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js b/js-old/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js similarity index 100% rename from js/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js rename to js-old/src/modals/Shapeshift/OptionsStep/optionsSteps.spec.js diff --git a/js/src/modals/Shapeshift/Price/index.js b/js-old/src/modals/Shapeshift/Price/index.js similarity index 100% rename from js/src/modals/Shapeshift/Price/index.js rename to js-old/src/modals/Shapeshift/Price/index.js diff --git a/js/src/modals/Shapeshift/Price/price.js b/js-old/src/modals/Shapeshift/Price/price.js similarity index 100% rename from js/src/modals/Shapeshift/Price/price.js rename to js-old/src/modals/Shapeshift/Price/price.js diff --git a/js/src/modals/Shapeshift/Price/price.spec.js b/js-old/src/modals/Shapeshift/Price/price.spec.js similarity index 100% rename from js/src/modals/Shapeshift/Price/price.spec.js rename to js-old/src/modals/Shapeshift/Price/price.spec.js diff --git a/js/src/modals/Shapeshift/Value/index.js b/js-old/src/modals/Shapeshift/Value/index.js similarity index 100% rename from js/src/modals/Shapeshift/Value/index.js rename to js-old/src/modals/Shapeshift/Value/index.js diff --git a/js/src/modals/Shapeshift/Value/value.css b/js-old/src/modals/Shapeshift/Value/value.css similarity index 100% rename from js/src/modals/Shapeshift/Value/value.css rename to js-old/src/modals/Shapeshift/Value/value.css diff --git a/js/src/modals/Shapeshift/Value/value.js b/js-old/src/modals/Shapeshift/Value/value.js similarity index 100% rename from js/src/modals/Shapeshift/Value/value.js rename to js-old/src/modals/Shapeshift/Value/value.js diff --git a/js/src/modals/Shapeshift/Value/value.spec.js b/js-old/src/modals/Shapeshift/Value/value.spec.js similarity index 100% rename from js/src/modals/Shapeshift/Value/value.spec.js rename to js-old/src/modals/Shapeshift/Value/value.spec.js diff --git a/js/src/modals/Shapeshift/index.js b/js-old/src/modals/Shapeshift/index.js similarity index 100% rename from js/src/modals/Shapeshift/index.js rename to js-old/src/modals/Shapeshift/index.js diff --git a/js/src/modals/Shapeshift/shapeshift.css b/js-old/src/modals/Shapeshift/shapeshift.css similarity index 100% rename from js/src/modals/Shapeshift/shapeshift.css rename to js-old/src/modals/Shapeshift/shapeshift.css diff --git a/js/src/modals/Shapeshift/shapeshift.js b/js-old/src/modals/Shapeshift/shapeshift.js similarity index 100% rename from js/src/modals/Shapeshift/shapeshift.js rename to js-old/src/modals/Shapeshift/shapeshift.js diff --git a/js/src/modals/Shapeshift/shapeshift.spec.js b/js-old/src/modals/Shapeshift/shapeshift.spec.js similarity index 100% rename from js/src/modals/Shapeshift/shapeshift.spec.js rename to js-old/src/modals/Shapeshift/shapeshift.spec.js diff --git a/js/src/modals/Shapeshift/store.js b/js-old/src/modals/Shapeshift/store.js similarity index 100% rename from js/src/modals/Shapeshift/store.js rename to js-old/src/modals/Shapeshift/store.js diff --git a/js/src/modals/Shapeshift/store.spec.js b/js-old/src/modals/Shapeshift/store.spec.js similarity index 100% rename from js/src/modals/Shapeshift/store.spec.js rename to js-old/src/modals/Shapeshift/store.spec.js diff --git a/js/src/modals/Transfer/Details/details.js b/js-old/src/modals/Transfer/Details/details.js similarity index 100% rename from js/src/modals/Transfer/Details/details.js rename to js-old/src/modals/Transfer/Details/details.js diff --git a/js/src/modals/Transfer/Details/index.js b/js-old/src/modals/Transfer/Details/index.js similarity index 100% rename from js/src/modals/Transfer/Details/index.js rename to js-old/src/modals/Transfer/Details/index.js diff --git a/js/src/modals/Transfer/Details/tokenSelect.js b/js-old/src/modals/Transfer/Details/tokenSelect.js similarity index 100% rename from js/src/modals/Transfer/Details/tokenSelect.js rename to js-old/src/modals/Transfer/Details/tokenSelect.js diff --git a/js/src/modals/Transfer/Extras/extras.js b/js-old/src/modals/Transfer/Extras/extras.js similarity index 93% rename from js/src/modals/Transfer/Extras/extras.js rename to js-old/src/modals/Transfer/Extras/extras.js index 5cbccc36943c8e336dd080bedc6940246f3fd451..c3e2d1a8e6895360bd3e50305737205aa06e58b4 100644 --- a/js/src/modals/Transfer/Extras/extras.js +++ b/js-old/src/modals/Transfer/Extras/extras.js @@ -23,7 +23,6 @@ import styles from '../transfer.css'; export default class Extras extends Component { static propTypes = { - availability: PropTypes.string.isRequired, data: PropTypes.string, dataError: PropTypes.string, hideData: PropTypes.bool, @@ -39,14 +38,13 @@ export default class Extras extends Component { }; render () { - const { availability, gasStore, onChange } = this.props; + const { gasStore, onChange } = this.props; return ( { this.renderData() }
diff --git a/js/src/modals/Transfer/Extras/index.js b/js-old/src/modals/Transfer/Extras/index.js similarity index 100% rename from js/src/modals/Transfer/Extras/index.js rename to js-old/src/modals/Transfer/Extras/index.js diff --git a/js/src/modals/Transfer/errors.js b/js-old/src/modals/Transfer/errors.js similarity index 100% rename from js/src/modals/Transfer/errors.js rename to js-old/src/modals/Transfer/errors.js diff --git a/js/src/modals/Transfer/index.js b/js-old/src/modals/Transfer/index.js similarity index 100% rename from js/src/modals/Transfer/index.js rename to js-old/src/modals/Transfer/index.js diff --git a/js/src/modals/Transfer/store.js b/js-old/src/modals/Transfer/store.js similarity index 99% rename from js/src/modals/Transfer/store.js rename to js-old/src/modals/Transfer/store.js index 71458c85d673633cec4a33b8cce79691f929102f..eaccf4f40c9026e12daa24c4600917136588275d 100644 --- a/js/src/modals/Transfer/store.js +++ b/js-old/src/modals/Transfer/store.js @@ -133,8 +133,8 @@ export default class TransferStore { } @action handleClose = () => { - this.onClose(); this.stage = 0; + this.onClose(); } @action onUpdateDetails = (type, value) => { @@ -169,6 +169,7 @@ export default class TransferStore { } @action onSend = () => { + this.onNext(); this.sending = true; this diff --git a/js/src/modals/Transfer/transfer.css b/js-old/src/modals/Transfer/transfer.css similarity index 100% rename from js/src/modals/Transfer/transfer.css rename to js-old/src/modals/Transfer/transfer.css diff --git a/js/src/modals/Transfer/transfer.js b/js-old/src/modals/Transfer/transfer.js similarity index 95% rename from js/src/modals/Transfer/transfer.js rename to js-old/src/modals/Transfer/transfer.js index 25e5d4f8f47d3c3a0689e06682e8ba382cf669dd..ab769ff02dab4628df48bebc17ebccfb2560fefa 100644 --- a/js/src/modals/Transfer/transfer.js +++ b/js-old/src/modals/Transfer/transfer.js @@ -42,7 +42,6 @@ class Transfer extends Component { } static propTypes = { - availability: PropTypes.string.isRequired, newError: PropTypes.func.isRequired, gasLimit: PropTypes.object.isRequired, @@ -187,14 +186,13 @@ class Transfer extends Component { onChange={ this.store.onUpdateDetails } total={ total } totalError={ totalError } - availability={ this.props.availability } /> ); } renderDialogActions () { const { account } = this.props; - const { extras, sending, stage, isValid } = this.store; + const { extras, sending, stage } = this.store; const cancelBtn = (
); }) .filter((node) => node); @@ -117,15 +140,11 @@ export class Balance extends Component { } function mapStateToProps (state, props) { - const { balances, tokens: allTokens } = state; + const { balances, tokens } = state; const { address } = props; - const balance = balances[address] || props.balance || {}; - - const tokenIds = Object.keys(balance); - const tokens = pick(allTokens, tokenIds); return { - balance, + balance: balances[address] || props.balance || {}, tokens }; } diff --git a/js/src/ui/Balance/balance.spec.js b/js-old/src/ui/Balance/balance.spec.js similarity index 94% rename from js/src/ui/Balance/balance.spec.js rename to js-old/src/ui/Balance/balance.spec.js index c1637329bcd3a0e245b0290275fa8cb01f9bb834..d5601a489fb269b15706ff55e4a73543dbfb9a58 100644 --- a/js/src/ui/Balance/balance.spec.js +++ b/js-old/src/ui/Balance/balance.spec.js @@ -84,13 +84,13 @@ describe('ui/Balance', () => { }); it('renders all the non-zero balances', () => { - expect(component.find('Connect(TokenValue)')).to.have.length(2); + expect(component.find('Connect(TokenImage)')).to.have.length(2); }); describe('render specifiers', () => { it('renders all the tokens with showZeroValues', () => { render({ showZeroValues: true }); - expect(component.find('Connect(TokenValue)')).to.have.length(2); + expect(component.find('Connect(TokenImage)')).to.have.length(2); }); }); }); diff --git a/js/src/ui/Balance/index.js b/js-old/src/ui/Balance/index.js similarity index 100% rename from js/src/ui/Balance/index.js rename to js-old/src/ui/Balance/index.js diff --git a/js/src/ui/BlockStatus/blockStatus.css b/js-old/src/ui/BlockStatus/blockStatus.css similarity index 100% rename from js/src/ui/BlockStatus/blockStatus.css rename to js-old/src/ui/BlockStatus/blockStatus.css diff --git a/js/src/ui/BlockStatus/blockStatus.js b/js-old/src/ui/BlockStatus/blockStatus.js similarity index 100% rename from js/src/ui/BlockStatus/blockStatus.js rename to js-old/src/ui/BlockStatus/blockStatus.js diff --git a/js/src/ui/BlockStatus/blockStatus.spec.js b/js-old/src/ui/BlockStatus/blockStatus.spec.js similarity index 100% rename from js/src/ui/BlockStatus/blockStatus.spec.js rename to js-old/src/ui/BlockStatus/blockStatus.spec.js diff --git a/js/src/ui/BlockStatus/index.js b/js-old/src/ui/BlockStatus/index.js similarity index 100% rename from js/src/ui/BlockStatus/index.js rename to js-old/src/ui/BlockStatus/index.js diff --git a/js/src/ui/Button/button.css b/js-old/src/ui/Button/button.css similarity index 100% rename from js/src/ui/Button/button.css rename to js-old/src/ui/Button/button.css diff --git a/js/src/ui/Button/button.js b/js-old/src/ui/Button/button.js similarity index 100% rename from js/src/ui/Button/button.js rename to js-old/src/ui/Button/button.js diff --git a/js/src/ui/Button/button.spec.js b/js-old/src/ui/Button/button.spec.js similarity index 100% rename from js/src/ui/Button/button.spec.js rename to js-old/src/ui/Button/button.spec.js diff --git a/js/src/ui/Button/index.js b/js-old/src/ui/Button/index.js similarity index 100% rename from js/src/ui/Button/index.js rename to js-old/src/ui/Button/index.js diff --git a/js/src/ui/Certifications/certifications.css b/js-old/src/ui/Certifications/certifications.css similarity index 100% rename from js/src/ui/Certifications/certifications.css rename to js-old/src/ui/Certifications/certifications.css diff --git a/js/src/ui/Certifications/certifications.js b/js-old/src/ui/Certifications/certifications.js similarity index 100% rename from js/src/ui/Certifications/certifications.js rename to js-old/src/ui/Certifications/certifications.js diff --git a/js/src/ui/Certifications/index.js b/js-old/src/ui/Certifications/index.js similarity index 100% rename from js/src/ui/Certifications/index.js rename to js-old/src/ui/Certifications/index.js diff --git a/js/src/ui/ConfirmDialog/confirmDialog.css b/js-old/src/ui/ConfirmDialog/confirmDialog.css similarity index 100% rename from js/src/ui/ConfirmDialog/confirmDialog.css rename to js-old/src/ui/ConfirmDialog/confirmDialog.css diff --git a/js/src/ui/ConfirmDialog/confirmDialog.js b/js-old/src/ui/ConfirmDialog/confirmDialog.js similarity index 100% rename from js/src/ui/ConfirmDialog/confirmDialog.js rename to js-old/src/ui/ConfirmDialog/confirmDialog.js diff --git a/js/src/ui/ConfirmDialog/confirmDialog.spec.js b/js-old/src/ui/ConfirmDialog/confirmDialog.spec.js similarity index 100% rename from js/src/ui/ConfirmDialog/confirmDialog.spec.js rename to js-old/src/ui/ConfirmDialog/confirmDialog.spec.js diff --git a/js/src/ui/ConfirmDialog/index.js b/js-old/src/ui/ConfirmDialog/index.js similarity index 100% rename from js/src/ui/ConfirmDialog/index.js rename to js-old/src/ui/ConfirmDialog/index.js diff --git a/js/src/ui/Container/Title/index.js b/js-old/src/ui/Container/Title/index.js similarity index 100% rename from js/src/ui/Container/Title/index.js rename to js-old/src/ui/Container/Title/index.js diff --git a/js/src/ui/Container/Title/title.css b/js-old/src/ui/Container/Title/title.css similarity index 100% rename from js/src/ui/Container/Title/title.css rename to js-old/src/ui/Container/Title/title.css diff --git a/js/src/ui/Container/Title/title.js b/js-old/src/ui/Container/Title/title.js similarity index 100% rename from js/src/ui/Container/Title/title.js rename to js-old/src/ui/Container/Title/title.js diff --git a/js/src/ui/Container/Title/title.spec.js b/js-old/src/ui/Container/Title/title.spec.js similarity index 100% rename from js/src/ui/Container/Title/title.spec.js rename to js-old/src/ui/Container/Title/title.spec.js diff --git a/js/src/ui/Container/container.css b/js-old/src/ui/Container/container.css similarity index 100% rename from js/src/ui/Container/container.css rename to js-old/src/ui/Container/container.css diff --git a/js/src/ui/Container/container.js b/js-old/src/ui/Container/container.js similarity index 100% rename from js/src/ui/Container/container.js rename to js-old/src/ui/Container/container.js diff --git a/js/src/ui/Container/container.spec.js b/js-old/src/ui/Container/container.spec.js similarity index 100% rename from js/src/ui/Container/container.spec.js rename to js-old/src/ui/Container/container.spec.js diff --git a/js/src/ui/Container/index.js b/js-old/src/ui/Container/index.js similarity index 100% rename from js/src/ui/Container/index.js rename to js-old/src/ui/Container/index.js diff --git a/js/src/ui/ContextProvider/contextProvider.js b/js-old/src/ui/ContextProvider/contextProvider.js similarity index 100% rename from js/src/ui/ContextProvider/contextProvider.js rename to js-old/src/ui/ContextProvider/contextProvider.js diff --git a/js/src/ui/ContextProvider/index.js b/js-old/src/ui/ContextProvider/index.js similarity index 100% rename from js/src/ui/ContextProvider/index.js rename to js-old/src/ui/ContextProvider/index.js diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.css b/js-old/src/ui/CopyToClipboard/copyToClipboard.css similarity index 100% rename from js/src/ui/CopyToClipboard/copyToClipboard.css rename to js-old/src/ui/CopyToClipboard/copyToClipboard.css diff --git a/js/src/ui/CopyToClipboard/copyToClipboard.js b/js-old/src/ui/CopyToClipboard/copyToClipboard.js similarity index 100% rename from js/src/ui/CopyToClipboard/copyToClipboard.js rename to js-old/src/ui/CopyToClipboard/copyToClipboard.js diff --git a/js/src/ui/CopyToClipboard/index.js b/js-old/src/ui/CopyToClipboard/index.js similarity index 100% rename from js/src/ui/CopyToClipboard/index.js rename to js-old/src/ui/CopyToClipboard/index.js diff --git a/js/src/ui/CurrencySymbol/currencySymbol.example.js b/js-old/src/ui/CurrencySymbol/currencySymbol.example.js similarity index 91% rename from js/src/ui/CurrencySymbol/currencySymbol.example.js rename to js-old/src/ui/CurrencySymbol/currencySymbol.example.js index 1f33dbba86f9d397d15884b824af75c023cbe02b..c1b56ed5cfcb097d74c31471d9348216a0706145 100644 --- a/js/src/ui/CurrencySymbol/currencySymbol.example.js +++ b/js-old/src/ui/CurrencySymbol/currencySymbol.example.js @@ -45,12 +45,6 @@ export default class CurrencySymbolExample extends Component { netChain='expanse' /> - - - - ); } diff --git a/js/src/ui/CurrencySymbol/currencySymbol.js b/js-old/src/ui/CurrencySymbol/currencySymbol.js similarity index 95% rename from js/src/ui/CurrencySymbol/currencySymbol.js rename to js-old/src/ui/CurrencySymbol/currencySymbol.js index ec7f98458ecc12477b3a9d2fff8fce042dadfc69..3322b0301b7a881b4e69b2aa12c1fafc3d83f0a4 100644 --- a/js/src/ui/CurrencySymbol/currencySymbol.js +++ b/js-old/src/ui/CurrencySymbol/currencySymbol.js @@ -20,7 +20,6 @@ import { connect } from 'react-redux'; const SYMBOL_ETC = 'ETC'; const SYMBOL_ETH = 'ETH'; const SYMBOL_EXP = 'EXP'; -const SYMBOL_MUSIC = 'MUSIC'; export class CurrencySymbol extends Component { static propTypes = { @@ -46,9 +45,6 @@ export class CurrencySymbol extends Component { case 'expanse': return SYMBOL_EXP; - case 'musicoin': - return SYMBOL_MUSIC; - default: return SYMBOL_ETH; } diff --git a/js/src/ui/CurrencySymbol/currencySymbol.spec.js b/js-old/src/ui/CurrencySymbol/currencySymbol.spec.js similarity index 91% rename from js/src/ui/CurrencySymbol/currencySymbol.spec.js rename to js-old/src/ui/CurrencySymbol/currencySymbol.spec.js index f10557bd29844570e4d84e2c539547ae04b8913a..e705b5edc21bc22dfff808040b62f855831734df 100644 --- a/js/src/ui/CurrencySymbol/currencySymbol.spec.js +++ b/js-old/src/ui/CurrencySymbol/currencySymbol.spec.js @@ -74,10 +74,6 @@ describe('ui/CurrencySymbol', () => { expect(render('expanse').text()).equal('EXP'); }); - it('renders MUSIC for musicoin', () => { - expect(render('musicoin').text()).equal('MUSIC'); - }); - it('renders ETH as default', () => { expect(render('somethingElse').text()).equal('ETH'); }); @@ -99,9 +95,5 @@ describe('ui/CurrencySymbol', () => { it('render EXP', () => { expect(render('expanse').instance().renderSymbol()).equal('EXP'); }); - - it('render MUSIC', () => { - expect(render('musicoin').instance().renderSymbol()).equal('MUSIC'); - }); }); }); diff --git a/js/src/ui/CurrencySymbol/index.js b/js-old/src/ui/CurrencySymbol/index.js similarity index 100% rename from js/src/ui/CurrencySymbol/index.js rename to js-old/src/ui/CurrencySymbol/index.js diff --git a/js/src/ui/DappCard/dappCard.css b/js-old/src/ui/DappCard/dappCard.css similarity index 100% rename from js/src/ui/DappCard/dappCard.css rename to js-old/src/ui/DappCard/dappCard.css diff --git a/js/src/ui/DappCard/dappCard.js b/js-old/src/ui/DappCard/dappCard.js similarity index 96% rename from js/src/ui/DappCard/dappCard.js rename to js-old/src/ui/DappCard/dappCard.js index 0e3f65fccbd70563386cc3632a78ad61f59c1861..cc0faf47d2cf07ed1eb756822c1cfa8444e7dcde 100644 --- a/js/src/ui/DappCard/dappCard.js +++ b/js-old/src/ui/DappCard/dappCard.js @@ -19,7 +19,6 @@ import React, { Component, PropTypes } from 'react'; import Container, { Title as ContainerTitle } from '~/ui/Container'; import DappIcon from '~/ui/DappIcon'; import Tags from '~/ui/Tags'; -import DappVouchFor from '../DappVouchFor'; import styles from './dappCard.css'; @@ -62,7 +61,6 @@ export default class DappCard extends Component { app={ app } className={ styles.image } /> - ), description: ( ) }, @@ -49,13 +49,13 @@ const DEFAULTS = { name: ( ), description: ( ) } diff --git a/js/src/ui/Features/defaults.spec.js b/js-old/src/ui/Features/defaults.spec.js similarity index 100% rename from js/src/ui/Features/defaults.spec.js rename to js-old/src/ui/Features/defaults.spec.js diff --git a/js/src/ui/Features/features.css b/js-old/src/ui/Features/features.css similarity index 100% rename from js/src/ui/Features/features.css rename to js-old/src/ui/Features/features.css diff --git a/js/src/ui/Features/features.js b/js-old/src/ui/Features/features.js similarity index 100% rename from js/src/ui/Features/features.js rename to js-old/src/ui/Features/features.js diff --git a/js/src/ui/Features/features.spec.js b/js-old/src/ui/Features/features.spec.js similarity index 100% rename from js/src/ui/Features/features.spec.js rename to js-old/src/ui/Features/features.spec.js diff --git a/js/src/ui/Features/index.js b/js-old/src/ui/Features/index.js similarity index 100% rename from js/src/ui/Features/index.js rename to js-old/src/ui/Features/index.js diff --git a/js/src/ui/Features/store.js b/js-old/src/ui/Features/store.js similarity index 100% rename from js/src/ui/Features/store.js rename to js-old/src/ui/Features/store.js diff --git a/js/src/ui/Features/store.spec.js b/js-old/src/ui/Features/store.spec.js similarity index 100% rename from js/src/ui/Features/store.spec.js rename to js-old/src/ui/Features/store.spec.js diff --git a/js/src/ui/Form/AddressSelect/addressSelect.css b/js-old/src/ui/Form/AddressSelect/addressSelect.css similarity index 100% rename from js/src/ui/Form/AddressSelect/addressSelect.css rename to js-old/src/ui/Form/AddressSelect/addressSelect.css diff --git a/js/src/ui/Form/AddressSelect/addressSelect.js b/js-old/src/ui/Form/AddressSelect/addressSelect.js similarity index 97% rename from js/src/ui/Form/AddressSelect/addressSelect.js rename to js-old/src/ui/Form/AddressSelect/addressSelect.js index 41e58f19f043f9bbe950488474e32779b42854cf..8a2c6d577693fa26cbe7e40a808e5c6055a16d33 100644 --- a/js/src/ui/Form/AddressSelect/addressSelect.js +++ b/js-old/src/ui/Form/AddressSelect/addressSelect.js @@ -14,7 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import { eq } from 'lodash'; import React, { Component, PropTypes } from 'react'; import ReactDOM from 'react-dom'; import { connect } from 'react-redux'; @@ -94,18 +93,6 @@ class AddressSelect extends Component { } componentWillReceiveProps (nextProps) { - if (!eq(Object.keys(this.props.accounts), Object.keys(nextProps.accounts))) { - return this.setValues(nextProps); - } - - if (!eq(Object.keys(this.props.contacts), Object.keys(nextProps.contacts))) { - return this.setValues(nextProps); - } - - if (!eq(Object.keys(this.props.contracts), Object.keys(nextProps.contracts))) { - return this.setValues(nextProps); - } - if (this.store.values && this.store.values.length > 0) { return; } diff --git a/js/src/ui/Form/AddressSelect/addressSelectStore.js b/js-old/src/ui/Form/AddressSelect/addressSelectStore.js similarity index 99% rename from js/src/ui/Form/AddressSelect/addressSelectStore.js rename to js-old/src/ui/Form/AddressSelect/addressSelectStore.js index d897dc9a16d7b5b54d4776de51225bcabe8f3775..7fc1db4802c2ea0157db8e45b5f9679b97dd459c 100644 --- a/js/src/ui/Form/AddressSelect/addressSelectStore.js +++ b/js-old/src/ui/Form/AddressSelect/addressSelectStore.js @@ -165,8 +165,7 @@ export default class AddressSelectStore { const contactsN = Object.keys(contacts).length; if (accountsN + contractsN + contactsN === 0) { - this.initValues = []; - return this.handleChange(); + return; } this.initValues = [ diff --git a/js/src/ui/Form/AddressSelect/index.js b/js-old/src/ui/Form/AddressSelect/index.js similarity index 100% rename from js/src/ui/Form/AddressSelect/index.js rename to js-old/src/ui/Form/AddressSelect/index.js diff --git a/js/src/ui/Form/AutoComplete/autocomplete.css b/js-old/src/ui/Form/AutoComplete/autocomplete.css similarity index 100% rename from js/src/ui/Form/AutoComplete/autocomplete.css rename to js-old/src/ui/Form/AutoComplete/autocomplete.css diff --git a/js/src/ui/Form/AutoComplete/autocomplete.js b/js-old/src/ui/Form/AutoComplete/autocomplete.js similarity index 100% rename from js/src/ui/Form/AutoComplete/autocomplete.js rename to js-old/src/ui/Form/AutoComplete/autocomplete.js diff --git a/js/src/ui/Form/AutoComplete/index.js b/js-old/src/ui/Form/AutoComplete/index.js similarity index 100% rename from js/src/ui/Form/AutoComplete/index.js rename to js-old/src/ui/Form/AutoComplete/index.js diff --git a/js/src/ui/Form/DappUrlInput/dappUrlInput.js b/js-old/src/ui/Form/DappUrlInput/dappUrlInput.js similarity index 100% rename from js/src/ui/Form/DappUrlInput/dappUrlInput.js rename to js-old/src/ui/Form/DappUrlInput/dappUrlInput.js diff --git a/js/src/ui/Form/DappUrlInput/dappUrlInput.spec.js b/js-old/src/ui/Form/DappUrlInput/dappUrlInput.spec.js similarity index 100% rename from js/src/ui/Form/DappUrlInput/dappUrlInput.spec.js rename to js-old/src/ui/Form/DappUrlInput/dappUrlInput.spec.js diff --git a/js/src/ui/Form/DappUrlInput/index.js b/js-old/src/ui/Form/DappUrlInput/index.js similarity index 100% rename from js/src/ui/Form/DappUrlInput/index.js rename to js-old/src/ui/Form/DappUrlInput/index.js diff --git a/js/src/ui/Form/FileSelect/fileSelect.css b/js-old/src/ui/Form/FileSelect/fileSelect.css similarity index 100% rename from js/src/ui/Form/FileSelect/fileSelect.css rename to js-old/src/ui/Form/FileSelect/fileSelect.css diff --git a/js/src/ui/Form/FileSelect/fileSelect.js b/js-old/src/ui/Form/FileSelect/fileSelect.js similarity index 100% rename from js/src/ui/Form/FileSelect/fileSelect.js rename to js-old/src/ui/Form/FileSelect/fileSelect.js diff --git a/js/src/ui/Form/FileSelect/fileSelect.spec.js b/js-old/src/ui/Form/FileSelect/fileSelect.spec.js similarity index 100% rename from js/src/ui/Form/FileSelect/fileSelect.spec.js rename to js-old/src/ui/Form/FileSelect/fileSelect.spec.js diff --git a/js/src/ui/Form/FileSelect/index.js b/js-old/src/ui/Form/FileSelect/index.js similarity index 100% rename from js/src/ui/Form/FileSelect/index.js rename to js-old/src/ui/Form/FileSelect/index.js diff --git a/js/src/ui/Form/FormWrap/formWrap.css b/js-old/src/ui/Form/FormWrap/formWrap.css similarity index 100% rename from js/src/ui/Form/FormWrap/formWrap.css rename to js-old/src/ui/Form/FormWrap/formWrap.css diff --git a/js/src/ui/Form/FormWrap/formWrap.js b/js-old/src/ui/Form/FormWrap/formWrap.js similarity index 100% rename from js/src/ui/Form/FormWrap/formWrap.js rename to js-old/src/ui/Form/FormWrap/formWrap.js diff --git a/js/src/ui/Form/FormWrap/index.js b/js-old/src/ui/Form/FormWrap/index.js similarity index 100% rename from js/src/ui/Form/FormWrap/index.js rename to js-old/src/ui/Form/FormWrap/index.js diff --git a/js/src/ui/Form/Input/index.js b/js-old/src/ui/Form/Input/index.js similarity index 100% rename from js/src/ui/Form/Input/index.js rename to js-old/src/ui/Form/Input/index.js diff --git a/js/src/ui/Form/Input/input.css b/js-old/src/ui/Form/Input/input.css similarity index 100% rename from js/src/ui/Form/Input/input.css rename to js-old/src/ui/Form/Input/input.css diff --git a/js/src/ui/Form/Input/input.js b/js-old/src/ui/Form/Input/input.js similarity index 98% rename from js/src/ui/Form/Input/input.js rename to js-old/src/ui/Form/Input/input.js index 7de17d9f8002c542d23558a57d72d5a3b412cc6a..6eb506dc12829c3ced71c47f86b59c6076e8a9e6 100644 --- a/js/src/ui/Form/Input/input.js +++ b/js-old/src/ui/Form/Input/input.js @@ -18,7 +18,6 @@ import React, { Component, PropTypes } from 'react'; import { TextField } from 'material-ui'; import { noop } from 'lodash'; import keycode from 'keycode'; -import localStore from 'store'; import { nodeOrStringProptype } from '~/util/proptypes'; import { toString } from '~/util/messages'; @@ -224,9 +223,7 @@ export default class Input extends Component { } onChange = (event, value) => { - const isDev = localStore.get('allYourBaseAreBelongToUs') || false; - - if (!this.props.allowPaste && !isDev) { + if (!this.props.allowPaste) { if (value.length - this.state.value.length > 8) { return; } diff --git a/js/src/ui/Form/InputAddress/index.js b/js-old/src/ui/Form/InputAddress/index.js similarity index 100% rename from js/src/ui/Form/InputAddress/index.js rename to js-old/src/ui/Form/InputAddress/index.js diff --git a/js/src/ui/Form/InputAddress/inputAddress.css b/js-old/src/ui/Form/InputAddress/inputAddress.css similarity index 100% rename from js/src/ui/Form/InputAddress/inputAddress.css rename to js-old/src/ui/Form/InputAddress/inputAddress.css diff --git a/js/src/ui/Form/InputAddress/inputAddress.js b/js-old/src/ui/Form/InputAddress/inputAddress.js similarity index 100% rename from js/src/ui/Form/InputAddress/inputAddress.js rename to js-old/src/ui/Form/InputAddress/inputAddress.js diff --git a/js/src/ui/Form/InputAddressSelect/index.js b/js-old/src/ui/Form/InputAddressSelect/index.js similarity index 100% rename from js/src/ui/Form/InputAddressSelect/index.js rename to js-old/src/ui/Form/InputAddressSelect/index.js diff --git a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js b/js-old/src/ui/Form/InputAddressSelect/inputAddressSelect.js similarity index 69% rename from js/src/ui/Form/InputAddressSelect/inputAddressSelect.js rename to js-old/src/ui/Form/InputAddressSelect/inputAddressSelect.js index 29e7a6fe67efa8f9ec8ffad2f71bf31c30cc3bd4..8199fece66012a873513d202778724fa9754a687 100644 --- a/js/src/ui/Form/InputAddressSelect/inputAddressSelect.js +++ b/js-old/src/ui/Form/InputAddressSelect/inputAddressSelect.js @@ -14,7 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import { pick } from 'lodash'; import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; @@ -29,7 +28,6 @@ class InputAddressSelect extends Component { contracts: PropTypes.object.isRequired, allowCopy: PropTypes.bool, - allowedValues: PropTypes.array, className: PropTypes.string, error: nodeOrStringProptype(), hint: nodeOrStringProptype(), @@ -40,33 +38,16 @@ class InputAddressSelect extends Component { }; render () { - const { accounts, allowCopy, allowedValues, className, contacts, contracts, label, hint, error, value, onChange, readOnly } = this.props; - // Add the currently selected value to the list - // of allowed values, if any given - const nextAllowedValues = allowedValues - ? [].concat(allowedValues, value || []) - : null; - - const filteredAccounts = nextAllowedValues - ? pick(accounts, nextAllowedValues) - : accounts; - - const filteredContacts = nextAllowedValues - ? pick(contacts, nextAllowedValues) - : contacts; - - const filteredContracts = nextAllowedValues - ? pick(contracts, nextAllowedValues) - : contracts; + const { accounts, allowCopy, className, contacts, contracts, label, hint, error, value, onChange, readOnly } = this.props; return ( ', `unknown "${param}" param passed to props`); + console.error('', `unkown "${param}" param passed to props`); return null; } @@ -97,7 +97,7 @@ export default class TypedInput extends Component { const { type } = param; if (type === ABI_TYPES.ARRAY) { - const { allowedValues, className, label } = this.props; + const { accounts, className, label } = this.props; const { subtype, length } = param; const value = this.getValue() || param.default; @@ -113,8 +113,8 @@ export default class TypedInput extends Component { return ( - { this.renderConditionRadioButtons() } + + } + onChange={ this.onChangeConditionType } + value={ conditionType } + values={ CONDITION_VALUES } + /> { this.renderConditions() }
@@ -138,35 +148,10 @@ export default class GasPriceEditor extends Component { ); } - renderConditionRadioButtons () { - const { availability } = this.props; - const { conditionType } = this.props.store; - - if (availability !== 'personal') { - return null; - } - - return ( - - } - onChange={ this.onChangeConditionType } - value={ conditionType } - values={ CONDITION_VALUES } - /> - ); - } - renderConditions () { - const { availability } = this.props; const { conditionType, condition, conditionBlockError } = this.props.store; - if (conditionType === CONDITIONS.NONE || availability !== 'personal') { + if (conditionType === CONDITIONS.NONE) { return null; } diff --git a/js/src/ui/GasPriceEditor/gasPriceEditor.spec.js b/js-old/src/ui/GasPriceEditor/gasPriceEditor.spec.js similarity index 100% rename from js/src/ui/GasPriceEditor/gasPriceEditor.spec.js rename to js-old/src/ui/GasPriceEditor/gasPriceEditor.spec.js diff --git a/js/src/ui/GasPriceEditor/index.js b/js-old/src/ui/GasPriceEditor/index.js similarity index 100% rename from js/src/ui/GasPriceEditor/index.js rename to js-old/src/ui/GasPriceEditor/index.js diff --git a/js/src/ui/GasPriceEditor/store.js b/js-old/src/ui/GasPriceEditor/store.js similarity index 100% rename from js/src/ui/GasPriceEditor/store.js rename to js-old/src/ui/GasPriceEditor/store.js diff --git a/js/src/ui/GasPriceEditor/store.spec.js b/js-old/src/ui/GasPriceEditor/store.spec.js similarity index 100% rename from js/src/ui/GasPriceEditor/store.spec.js rename to js-old/src/ui/GasPriceEditor/store.spec.js diff --git a/js/src/ui/GasPriceSelector/CustomBar/customBar.js b/js-old/src/ui/GasPriceSelector/CustomBar/customBar.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomBar/customBar.js rename to js-old/src/ui/GasPriceSelector/CustomBar/customBar.js diff --git a/js/src/ui/GasPriceSelector/CustomBar/index.js b/js-old/src/ui/GasPriceSelector/CustomBar/index.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomBar/index.js rename to js-old/src/ui/GasPriceSelector/CustomBar/index.js diff --git a/js/src/ui/GasPriceSelector/CustomCursor/customCursor.js b/js-old/src/ui/GasPriceSelector/CustomCursor/customCursor.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomCursor/customCursor.js rename to js-old/src/ui/GasPriceSelector/CustomCursor/customCursor.js diff --git a/js/src/ui/GasPriceSelector/CustomCursor/index.js b/js-old/src/ui/GasPriceSelector/CustomCursor/index.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomCursor/index.js rename to js-old/src/ui/GasPriceSelector/CustomCursor/index.js diff --git a/js/src/ui/GasPriceSelector/CustomShape/customShape.js b/js-old/src/ui/GasPriceSelector/CustomShape/customShape.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomShape/customShape.js rename to js-old/src/ui/GasPriceSelector/CustomShape/customShape.js diff --git a/js/src/ui/GasPriceSelector/CustomShape/index.js b/js-old/src/ui/GasPriceSelector/CustomShape/index.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomShape/index.js rename to js-old/src/ui/GasPriceSelector/CustomShape/index.js diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js b/js-old/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js rename to js-old/src/ui/GasPriceSelector/CustomTooltip/customTooltip.js diff --git a/js/src/ui/GasPriceSelector/CustomTooltip/index.js b/js-old/src/ui/GasPriceSelector/CustomTooltip/index.js similarity index 100% rename from js/src/ui/GasPriceSelector/CustomTooltip/index.js rename to js-old/src/ui/GasPriceSelector/CustomTooltip/index.js diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.css b/js-old/src/ui/GasPriceSelector/gasPriceSelector.css similarity index 100% rename from js/src/ui/GasPriceSelector/gasPriceSelector.css rename to js-old/src/ui/GasPriceSelector/gasPriceSelector.css diff --git a/js/src/ui/GasPriceSelector/gasPriceSelector.js b/js-old/src/ui/GasPriceSelector/gasPriceSelector.js similarity index 100% rename from js/src/ui/GasPriceSelector/gasPriceSelector.js rename to js-old/src/ui/GasPriceSelector/gasPriceSelector.js diff --git a/js/src/ui/GasPriceSelector/index.js b/js-old/src/ui/GasPriceSelector/index.js similarity index 100% rename from js/src/ui/GasPriceSelector/index.js rename to js-old/src/ui/GasPriceSelector/index.js diff --git a/js/src/ui/GasPriceSelector/util.js b/js-old/src/ui/GasPriceSelector/util.js similarity index 100% rename from js/src/ui/GasPriceSelector/util.js rename to js-old/src/ui/GasPriceSelector/util.js diff --git a/js/src/ui/Icons/index.js b/js-old/src/ui/Icons/index.js similarity index 100% rename from js/src/ui/Icons/index.js rename to js-old/src/ui/Icons/index.js diff --git a/js/src/ui/Icons/index.spec.js b/js-old/src/ui/Icons/index.spec.js similarity index 100% rename from js/src/ui/Icons/index.spec.js rename to js-old/src/ui/Icons/index.spec.js diff --git a/js/src/ui/IdentityIcon/identityIcon.css b/js-old/src/ui/IdentityIcon/identityIcon.css similarity index 100% rename from js/src/ui/IdentityIcon/identityIcon.css rename to js-old/src/ui/IdentityIcon/identityIcon.css diff --git a/js/src/ui/IdentityIcon/identityIcon.js b/js-old/src/ui/IdentityIcon/identityIcon.js similarity index 95% rename from js/src/ui/IdentityIcon/identityIcon.js rename to js-old/src/ui/IdentityIcon/identityIcon.js index 0d31b6bb53d6d08f57739f0ed190b58d0c67a8a6..3db1bc763102244a76931ceed2218f28f7cd6eec 100644 --- a/js/src/ui/IdentityIcon/identityIcon.js +++ b/js-old/src/ui/IdentityIcon/identityIcon.js @@ -30,7 +30,6 @@ class IdentityIcon extends Component { static propTypes = { address: PropTypes.string, - alt: PropTypes.string, button: PropTypes.bool, center: PropTypes.bool, className: PropTypes.string, @@ -85,7 +84,7 @@ class IdentityIcon extends Component { } render () { - const { address, alt, button, className, center, disabled, inline, padded, tiny } = this.props; + const { address, button, className, center, disabled, inline, padded, tiny } = this.props; const { iconsrc } = this.state; const classes = [ styles.icon, @@ -136,7 +135,6 @@ class IdentityIcon extends Component { return ( { } value={ this.store.locale } diff --git a/js/src/ui/LanguageSelector/langugeSelector.spec.js b/js-old/src/ui/LanguageSelector/langugeSelector.spec.js similarity index 100% rename from js/src/ui/LanguageSelector/langugeSelector.spec.js rename to js-old/src/ui/LanguageSelector/langugeSelector.spec.js diff --git a/js/src/ui/Loading/index.js b/js-old/src/ui/Loading/index.js similarity index 100% rename from js/src/ui/Loading/index.js rename to js-old/src/ui/Loading/index.js diff --git a/js/src/ui/Loading/loading.css b/js-old/src/ui/Loading/loading.css similarity index 100% rename from js/src/ui/Loading/loading.css rename to js-old/src/ui/Loading/loading.css diff --git a/js/src/ui/Loading/loading.js b/js-old/src/ui/Loading/loading.js similarity index 100% rename from js/src/ui/Loading/loading.js rename to js-old/src/ui/Loading/loading.js diff --git a/js/src/ui/MethodDecoding/index.js b/js-old/src/ui/MethodDecoding/index.js similarity index 100% rename from js/src/ui/MethodDecoding/index.js rename to js-old/src/ui/MethodDecoding/index.js diff --git a/js/src/ui/MethodDecoding/methodDecoding.css b/js-old/src/ui/MethodDecoding/methodDecoding.css similarity index 100% rename from js/src/ui/MethodDecoding/methodDecoding.css rename to js-old/src/ui/MethodDecoding/methodDecoding.css diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js-old/src/ui/MethodDecoding/methodDecoding.js similarity index 99% rename from js/src/ui/MethodDecoding/methodDecoding.js rename to js-old/src/ui/MethodDecoding/methodDecoding.js index 711e51ad916b8a1464f0ba084030f88a88cf9a9a..eb42a8bfff0303a9ae14fe31ef230d013971e693 100644 --- a/js/src/ui/MethodDecoding/methodDecoding.js +++ b/js-old/src/ui/MethodDecoding/methodDecoding.js @@ -23,7 +23,6 @@ import { connect } from 'react-redux'; import { TypedInput, InputAddress } from '../Form'; import MethodDecodingStore from './methodDecodingStore'; -import TokenValue from './tokenValue'; import styles from './methodDecoding.css'; @@ -603,10 +602,9 @@ class MethodDecoding extends Component { const { token } = this.props; return ( - + + { value.div(token.format).toFormat(5) } { token.tag } + ); } diff --git a/js/src/ui/MethodDecoding/methodDecodingStore.js b/js-old/src/ui/MethodDecoding/methodDecodingStore.js similarity index 100% rename from js/src/ui/MethodDecoding/methodDecodingStore.js rename to js-old/src/ui/MethodDecoding/methodDecodingStore.js diff --git a/js/src/ui/Modal/Busy/busy.css b/js-old/src/ui/Modal/Busy/busy.css similarity index 100% rename from js/src/ui/Modal/Busy/busy.css rename to js-old/src/ui/Modal/Busy/busy.css diff --git a/js/src/ui/Modal/Busy/busy.js b/js-old/src/ui/Modal/Busy/busy.js similarity index 100% rename from js/src/ui/Modal/Busy/busy.js rename to js-old/src/ui/Modal/Busy/busy.js diff --git a/js/src/ui/Modal/Busy/index.js b/js-old/src/ui/Modal/Busy/index.js similarity index 100% rename from js/src/ui/Modal/Busy/index.js rename to js-old/src/ui/Modal/Busy/index.js diff --git a/js/src/ui/Modal/Completed/completed.css b/js-old/src/ui/Modal/Completed/completed.css similarity index 100% rename from js/src/ui/Modal/Completed/completed.css rename to js-old/src/ui/Modal/Completed/completed.css diff --git a/js/src/ui/Modal/Completed/completed.js b/js-old/src/ui/Modal/Completed/completed.js similarity index 100% rename from js/src/ui/Modal/Completed/completed.js rename to js-old/src/ui/Modal/Completed/completed.js diff --git a/js/src/ui/Modal/Completed/index.js b/js-old/src/ui/Modal/Completed/index.js similarity index 100% rename from js/src/ui/Modal/Completed/index.js rename to js-old/src/ui/Modal/Completed/index.js diff --git a/js/src/ui/Modal/index.js b/js-old/src/ui/Modal/index.js similarity index 100% rename from js/src/ui/Modal/index.js rename to js-old/src/ui/Modal/index.js diff --git a/js/src/ui/ModalBox/body.js b/js-old/src/ui/ModalBox/body.js similarity index 100% rename from js/src/ui/ModalBox/body.js rename to js-old/src/ui/ModalBox/body.js diff --git a/js/src/ui/ModalBox/index.js b/js-old/src/ui/ModalBox/index.js similarity index 100% rename from js/src/ui/ModalBox/index.js rename to js-old/src/ui/ModalBox/index.js diff --git a/js/src/ui/ModalBox/modalBox.css b/js-old/src/ui/ModalBox/modalBox.css similarity index 100% rename from js/src/ui/ModalBox/modalBox.css rename to js-old/src/ui/ModalBox/modalBox.css diff --git a/js/src/ui/ModalBox/modalBox.js b/js-old/src/ui/ModalBox/modalBox.js similarity index 100% rename from js/src/ui/ModalBox/modalBox.js rename to js-old/src/ui/ModalBox/modalBox.js diff --git a/js/src/ui/ModalBox/modalBox.spec.js b/js-old/src/ui/ModalBox/modalBox.spec.js similarity index 100% rename from js/src/ui/ModalBox/modalBox.spec.js rename to js-old/src/ui/ModalBox/modalBox.spec.js diff --git a/js/src/ui/ModalBox/summary.js b/js-old/src/ui/ModalBox/summary.js similarity index 100% rename from js/src/ui/ModalBox/summary.js rename to js-old/src/ui/ModalBox/summary.js diff --git a/js/src/ui/Page/index.js b/js-old/src/ui/Page/index.js similarity index 100% rename from js/src/ui/Page/index.js rename to js-old/src/ui/Page/index.js diff --git a/js/src/ui/Page/page.css b/js-old/src/ui/Page/page.css similarity index 100% rename from js/src/ui/Page/page.css rename to js-old/src/ui/Page/page.css diff --git a/js/src/ui/Page/page.js b/js-old/src/ui/Page/page.js similarity index 100% rename from js/src/ui/Page/page.js rename to js-old/src/ui/Page/page.js diff --git a/js/src/ui/Page/page.spec.js b/js-old/src/ui/Page/page.spec.js similarity index 100% rename from js/src/ui/Page/page.spec.js rename to js-old/src/ui/Page/page.spec.js diff --git a/js/src/ui/ParityBackground/index.js b/js-old/src/ui/ParityBackground/index.js similarity index 100% rename from js/src/ui/ParityBackground/index.js rename to js-old/src/ui/ParityBackground/index.js diff --git a/js/src/ui/ParityBackground/parityBackground.js b/js-old/src/ui/ParityBackground/parityBackground.js similarity index 100% rename from js/src/ui/ParityBackground/parityBackground.js rename to js-old/src/ui/ParityBackground/parityBackground.js diff --git a/js/src/ui/Portal/index.js b/js-old/src/ui/Portal/index.js similarity index 100% rename from js/src/ui/Portal/index.js rename to js-old/src/ui/Portal/index.js diff --git a/js/src/ui/Portal/portal.css b/js-old/src/ui/Portal/portal.css similarity index 100% rename from js/src/ui/Portal/portal.css rename to js-old/src/ui/Portal/portal.css diff --git a/js/src/ui/Portal/portal.example.js b/js-old/src/ui/Portal/portal.example.js similarity index 100% rename from js/src/ui/Portal/portal.example.js rename to js-old/src/ui/Portal/portal.example.js diff --git a/js/src/ui/Portal/portal.js b/js-old/src/ui/Portal/portal.js similarity index 100% rename from js/src/ui/Portal/portal.js rename to js-old/src/ui/Portal/portal.js diff --git a/js/src/ui/Portal/portal.spec.js b/js-old/src/ui/Portal/portal.spec.js similarity index 100% rename from js/src/ui/Portal/portal.spec.js rename to js-old/src/ui/Portal/portal.spec.js diff --git a/js/src/ui/QrCode/index.js b/js-old/src/ui/QrCode/index.js similarity index 100% rename from js/src/ui/QrCode/index.js rename to js-old/src/ui/QrCode/index.js diff --git a/js/src/ui/QrCode/qrCode.css b/js-old/src/ui/QrCode/qrCode.css similarity index 100% rename from js/src/ui/QrCode/qrCode.css rename to js-old/src/ui/QrCode/qrCode.css diff --git a/js/src/ui/QrCode/qrCode.example.js b/js-old/src/ui/QrCode/qrCode.example.js similarity index 100% rename from js/src/ui/QrCode/qrCode.example.js rename to js-old/src/ui/QrCode/qrCode.example.js diff --git a/js/src/ui/QrCode/qrCode.js b/js-old/src/ui/QrCode/qrCode.js similarity index 100% rename from js/src/ui/QrCode/qrCode.js rename to js-old/src/ui/QrCode/qrCode.js diff --git a/js/src/ui/QrCode/qrCode.spec.js b/js-old/src/ui/QrCode/qrCode.spec.js similarity index 100% rename from js/src/ui/QrCode/qrCode.spec.js rename to js-old/src/ui/QrCode/qrCode.spec.js diff --git a/js/src/ui/QrCode/qrSize.js b/js-old/src/ui/QrCode/qrSize.js similarity index 100% rename from js/src/ui/QrCode/qrSize.js rename to js-old/src/ui/QrCode/qrSize.js diff --git a/js/src/ui/QrScan/index.js b/js-old/src/ui/QrScan/index.js similarity index 100% rename from js/src/ui/QrScan/index.js rename to js-old/src/ui/QrScan/index.js diff --git a/js/src/ui/QrScan/qrScan.css b/js-old/src/ui/QrScan/qrScan.css similarity index 100% rename from js/src/ui/QrScan/qrScan.css rename to js-old/src/ui/QrScan/qrScan.css diff --git a/js/src/ui/QrScan/qrScan.js b/js-old/src/ui/QrScan/qrScan.js similarity index 100% rename from js/src/ui/QrScan/qrScan.js rename to js-old/src/ui/QrScan/qrScan.js diff --git a/js/src/ui/QrScan/qrScan.spec.js b/js-old/src/ui/QrScan/qrScan.spec.js similarity index 100% rename from js/src/ui/QrScan/qrScan.spec.js rename to js-old/src/ui/QrScan/qrScan.spec.js diff --git a/js/src/ui/ScrollableText/index.js b/js-old/src/ui/ScrollableText/index.js similarity index 100% rename from js/src/ui/ScrollableText/index.js rename to js-old/src/ui/ScrollableText/index.js diff --git a/js/src/ui/ScrollableText/scrollableText.css b/js-old/src/ui/ScrollableText/scrollableText.css similarity index 100% rename from js/src/ui/ScrollableText/scrollableText.css rename to js-old/src/ui/ScrollableText/scrollableText.css diff --git a/js/src/ui/ScrollableText/scrollableText.js b/js-old/src/ui/ScrollableText/scrollableText.js similarity index 100% rename from js/src/ui/ScrollableText/scrollableText.js rename to js-old/src/ui/ScrollableText/scrollableText.js diff --git a/js/src/ui/SectionList/index.js b/js-old/src/ui/SectionList/index.js similarity index 100% rename from js/src/ui/SectionList/index.js rename to js-old/src/ui/SectionList/index.js diff --git a/js/src/ui/SectionList/sectionList.css b/js-old/src/ui/SectionList/sectionList.css similarity index 100% rename from js/src/ui/SectionList/sectionList.css rename to js-old/src/ui/SectionList/sectionList.css diff --git a/js/src/ui/SectionList/sectionList.example.js b/js-old/src/ui/SectionList/sectionList.example.js similarity index 100% rename from js/src/ui/SectionList/sectionList.example.js rename to js-old/src/ui/SectionList/sectionList.example.js diff --git a/js/src/ui/SectionList/sectionList.js b/js-old/src/ui/SectionList/sectionList.js similarity index 100% rename from js/src/ui/SectionList/sectionList.js rename to js-old/src/ui/SectionList/sectionList.js diff --git a/js/src/ui/SectionList/sectionList.spec.js b/js-old/src/ui/SectionList/sectionList.spec.js similarity index 100% rename from js/src/ui/SectionList/sectionList.spec.js rename to js-old/src/ui/SectionList/sectionList.spec.js diff --git a/js/src/ui/SelectionList/index.js b/js-old/src/ui/SelectionList/index.js similarity index 100% rename from js/src/ui/SelectionList/index.js rename to js-old/src/ui/SelectionList/index.js diff --git a/js/src/ui/SelectionList/selectionList.css b/js-old/src/ui/SelectionList/selectionList.css similarity index 98% rename from js/src/ui/SelectionList/selectionList.css rename to js-old/src/ui/SelectionList/selectionList.css index 73721e54ac876bd998c73a18915505f6a402f1cf..b6e6b05f9fddc23a8d3102e2a6d2a8678d883172 100644 --- a/js/src/ui/SelectionList/selectionList.css +++ b/js-old/src/ui/SelectionList/selectionList.css @@ -22,7 +22,6 @@ height: 100%; position: relative; width: 100%; - max-width: 100%; &:hover { filter: none; diff --git a/js/src/ui/SelectionList/selectionList.js b/js-old/src/ui/SelectionList/selectionList.js similarity index 100% rename from js/src/ui/SelectionList/selectionList.js rename to js-old/src/ui/SelectionList/selectionList.js diff --git a/js/src/ui/SelectionList/selectionList.spec.js b/js-old/src/ui/SelectionList/selectionList.spec.js similarity index 100% rename from js/src/ui/SelectionList/selectionList.spec.js rename to js-old/src/ui/SelectionList/selectionList.spec.js diff --git a/js/src/ui/ShortenedHash/index.js b/js-old/src/ui/ShortenedHash/index.js similarity index 100% rename from js/src/ui/ShortenedHash/index.js rename to js-old/src/ui/ShortenedHash/index.js diff --git a/js/src/ui/ShortenedHash/shortenedHash.css b/js-old/src/ui/ShortenedHash/shortenedHash.css similarity index 100% rename from js/src/ui/ShortenedHash/shortenedHash.css rename to js-old/src/ui/ShortenedHash/shortenedHash.css diff --git a/js/src/ui/ShortenedHash/shortenedHash.js b/js-old/src/ui/ShortenedHash/shortenedHash.js similarity index 100% rename from js/src/ui/ShortenedHash/shortenedHash.js rename to js-old/src/ui/ShortenedHash/shortenedHash.js diff --git a/js/src/ui/SignerIcon/index.js b/js-old/src/ui/SignerIcon/index.js similarity index 100% rename from js/src/ui/SignerIcon/index.js rename to js-old/src/ui/SignerIcon/index.js diff --git a/js/src/ui/SignerIcon/signerIcon.js b/js-old/src/ui/SignerIcon/signerIcon.js similarity index 100% rename from js/src/ui/SignerIcon/signerIcon.js rename to js-old/src/ui/SignerIcon/signerIcon.js diff --git a/js/src/ui/StackEventListener/index.js b/js-old/src/ui/StackEventListener/index.js similarity index 100% rename from js/src/ui/StackEventListener/index.js rename to js-old/src/ui/StackEventListener/index.js diff --git a/js/src/ui/StackEventListener/stackEventListener.js b/js-old/src/ui/StackEventListener/stackEventListener.js similarity index 100% rename from js/src/ui/StackEventListener/stackEventListener.js rename to js-old/src/ui/StackEventListener/stackEventListener.js diff --git a/js/src/ui/StatusIndicator/index.js b/js-old/src/ui/StatusIndicator/index.js similarity index 100% rename from js/src/ui/StatusIndicator/index.js rename to js-old/src/ui/StatusIndicator/index.js diff --git a/js/src/ui/StatusIndicator/statusIndicator.css b/js-old/src/ui/StatusIndicator/statusIndicator.css similarity index 100% rename from js/src/ui/StatusIndicator/statusIndicator.css rename to js-old/src/ui/StatusIndicator/statusIndicator.css diff --git a/js/src/ui/StatusIndicator/statusIndicator.js b/js-old/src/ui/StatusIndicator/statusIndicator.js similarity index 100% rename from js/src/ui/StatusIndicator/statusIndicator.js rename to js-old/src/ui/StatusIndicator/statusIndicator.js diff --git a/js/src/ui/Tags/index.js b/js-old/src/ui/Tags/index.js similarity index 100% rename from js/src/ui/Tags/index.js rename to js-old/src/ui/Tags/index.js diff --git a/js/src/ui/Tags/tags.css b/js-old/src/ui/Tags/tags.css similarity index 100% rename from js/src/ui/Tags/tags.css rename to js-old/src/ui/Tags/tags.css diff --git a/js/src/ui/Tags/tags.js b/js-old/src/ui/Tags/tags.js similarity index 100% rename from js/src/ui/Tags/tags.js rename to js-old/src/ui/Tags/tags.js diff --git a/js/src/ui/Theme/index.js b/js-old/src/ui/Theme/index.js similarity index 100% rename from js/src/ui/Theme/index.js rename to js-old/src/ui/Theme/index.js diff --git a/js/src/ui/Theme/theme.js b/js-old/src/ui/Theme/theme.js similarity index 100% rename from js/src/ui/Theme/theme.js rename to js-old/src/ui/Theme/theme.js diff --git a/js/src/ui/Theme/theme.spec.js b/js-old/src/ui/Theme/theme.spec.js similarity index 100% rename from js/src/ui/Theme/theme.spec.js rename to js-old/src/ui/Theme/theme.spec.js diff --git a/js/src/ui/Title/index.js b/js-old/src/ui/Title/index.js similarity index 100% rename from js/src/ui/Title/index.js rename to js-old/src/ui/Title/index.js diff --git a/js/src/ui/Title/title.css b/js-old/src/ui/Title/title.css similarity index 100% rename from js/src/ui/Title/title.css rename to js-old/src/ui/Title/title.css diff --git a/js/src/ui/Title/title.js b/js-old/src/ui/Title/title.js similarity index 100% rename from js/src/ui/Title/title.js rename to js-old/src/ui/Title/title.js diff --git a/js/src/ui/Title/title.spec.js b/js-old/src/ui/Title/title.spec.js similarity index 100% rename from js/src/ui/Title/title.spec.js rename to js-old/src/ui/Title/title.spec.js diff --git a/js/src/ui/TokenImage/index.js b/js-old/src/ui/TokenImage/index.js similarity index 100% rename from js/src/ui/TokenImage/index.js rename to js-old/src/ui/TokenImage/index.js diff --git a/js/src/ui/TokenImage/tokenImage.js b/js-old/src/ui/TokenImage/tokenImage.js similarity index 89% rename from js/src/ui/TokenImage/tokenImage.js rename to js-old/src/ui/TokenImage/tokenImage.js index e0e66d22b718dfd538b58cc27fd47ee1e3dd018e..af7a80a02bd066b286a0cdad6c0f40b4cc3cfc23 100644 --- a/js/src/ui/TokenImage/tokenImage.js +++ b/js-old/src/ui/TokenImage/tokenImage.js @@ -32,14 +32,19 @@ class TokenImage extends Component { }).isRequired }; + state = { + error: false + }; + render () { + const { error } = this.state; const { api } = this.context; const { image, token } = this.props; const imageurl = token.image || image; let imagesrc = unknownImage; - if (imageurl) { + if (imageurl && !error) { const host = /^(\/)?api/.test(imageurl) ? api.dappsUrl : ''; @@ -49,11 +54,16 @@ class TokenImage extends Component { return ( { ); } + + handleError = () => { + this.setState({ error: true }); + }; } function mapStateToProps (iniState) { diff --git a/js/src/ui/Tooltips/Tooltip/index.js b/js-old/src/ui/Tooltips/Tooltip/index.js similarity index 100% rename from js/src/ui/Tooltips/Tooltip/index.js rename to js-old/src/ui/Tooltips/Tooltip/index.js diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.js b/js-old/src/ui/Tooltips/Tooltip/tooltip.js similarity index 100% rename from js/src/ui/Tooltips/Tooltip/tooltip.js rename to js-old/src/ui/Tooltips/Tooltip/tooltip.js diff --git a/js/src/ui/Tooltips/Tooltip/tooltip.spec.js b/js-old/src/ui/Tooltips/Tooltip/tooltip.spec.js similarity index 100% rename from js/src/ui/Tooltips/Tooltip/tooltip.spec.js rename to js-old/src/ui/Tooltips/Tooltip/tooltip.spec.js diff --git a/js/src/ui/Tooltips/actions.js b/js-old/src/ui/Tooltips/actions.js similarity index 100% rename from js/src/ui/Tooltips/actions.js rename to js-old/src/ui/Tooltips/actions.js diff --git a/js/src/ui/Tooltips/index.js b/js-old/src/ui/Tooltips/index.js similarity index 100% rename from js/src/ui/Tooltips/index.js rename to js-old/src/ui/Tooltips/index.js diff --git a/js/src/ui/Tooltips/reducers.js b/js-old/src/ui/Tooltips/reducers.js similarity index 100% rename from js/src/ui/Tooltips/reducers.js rename to js-old/src/ui/Tooltips/reducers.js diff --git a/js/src/ui/Tooltips/tooltips.css b/js-old/src/ui/Tooltips/tooltips.css similarity index 100% rename from js/src/ui/Tooltips/tooltips.css rename to js-old/src/ui/Tooltips/tooltips.css diff --git a/js/src/ui/Tooltips/tooltips.js b/js-old/src/ui/Tooltips/tooltips.js similarity index 100% rename from js/src/ui/Tooltips/tooltips.js rename to js-old/src/ui/Tooltips/tooltips.js diff --git a/js/src/ui/Tooltips/tooltips.spec.js b/js-old/src/ui/Tooltips/tooltips.spec.js similarity index 100% rename from js/src/ui/Tooltips/tooltips.spec.js rename to js-old/src/ui/Tooltips/tooltips.spec.js diff --git a/js/src/ui/TxHash/index.js b/js-old/src/ui/TxHash/index.js similarity index 100% rename from js/src/ui/TxHash/index.js rename to js-old/src/ui/TxHash/index.js diff --git a/js/src/ui/TxHash/txHash.css b/js-old/src/ui/TxHash/txHash.css similarity index 100% rename from js/src/ui/TxHash/txHash.css rename to js-old/src/ui/TxHash/txHash.css diff --git a/js/src/ui/TxHash/txHash.js b/js-old/src/ui/TxHash/txHash.js similarity index 100% rename from js/src/ui/TxHash/txHash.js rename to js-old/src/ui/TxHash/txHash.js diff --git a/js/src/ui/TxHash/txHash.spec.js b/js-old/src/ui/TxHash/txHash.spec.js similarity index 100% rename from js/src/ui/TxHash/txHash.spec.js rename to js-old/src/ui/TxHash/txHash.spec.js diff --git a/js/src/ui/TxList/TxRow/index.js b/js-old/src/ui/TxList/TxRow/index.js similarity index 100% rename from js/src/ui/TxList/TxRow/index.js rename to js-old/src/ui/TxList/TxRow/index.js diff --git a/js/src/ui/TxList/TxRow/txRow.js b/js-old/src/ui/TxList/TxRow/txRow.js similarity index 99% rename from js/src/ui/TxList/TxRow/txRow.js rename to js-old/src/ui/TxList/TxRow/txRow.js index fc40fc596905b40dba7a28fde33e8eb88a4b15cb..a28736ddbd7a04714bee5b77d5a8546cceb7a282 100644 --- a/js/src/ui/TxList/TxRow/txRow.js +++ b/js-old/src/ui/TxList/TxRow/txRow.js @@ -291,7 +291,7 @@ class TxRow extends Component {
diff --git a/js/src/ui/TxList/TxRow/txRow.spec.js b/js-old/src/ui/TxList/TxRow/txRow.spec.js similarity index 98% rename from js/src/ui/TxList/TxRow/txRow.spec.js rename to js-old/src/ui/TxList/TxRow/txRow.spec.js index 6f92d1faab5c2c2bc568eeae2e7799ad20a52e20..9ff5ffbe312d95aee88b273d6bdf8c81b230f54a 100644 --- a/js/src/ui/TxList/TxRow/txRow.spec.js +++ b/js-old/src/ui/TxList/TxRow/txRow.spec.js @@ -23,7 +23,7 @@ import Api from '~/api'; import TxRow from './txRow'; -const api = new Api({ execute: sinon.stub(), on: sinon.stub() }); +const api = new Api({ execute: sinon.stub() }); const STORE = { dispatch: sinon.stub(), diff --git a/js/src/ui/TxList/index.js b/js-old/src/ui/TxList/index.js similarity index 100% rename from js/src/ui/TxList/index.js rename to js-old/src/ui/TxList/index.js diff --git a/js/src/ui/TxList/store.js b/js-old/src/ui/TxList/store.js similarity index 100% rename from js/src/ui/TxList/store.js rename to js-old/src/ui/TxList/store.js diff --git a/js/src/ui/TxList/store.spec.js b/js-old/src/ui/TxList/store.spec.js similarity index 100% rename from js/src/ui/TxList/store.spec.js rename to js-old/src/ui/TxList/store.spec.js diff --git a/js/src/ui/TxList/txList.css b/js-old/src/ui/TxList/txList.css similarity index 100% rename from js/src/ui/TxList/txList.css rename to js-old/src/ui/TxList/txList.css diff --git a/js/src/ui/TxList/txList.js b/js-old/src/ui/TxList/txList.js similarity index 100% rename from js/src/ui/TxList/txList.js rename to js-old/src/ui/TxList/txList.js diff --git a/js/src/ui/TxList/txList.spec.js b/js-old/src/ui/TxList/txList.spec.js similarity index 95% rename from js/src/ui/TxList/txList.spec.js rename to js-old/src/ui/TxList/txList.spec.js index 080ec1bb90ea215e844c4292f877954884304811..58a5237ac6a61bb8f4ea7af983953156af733abc 100644 --- a/js/src/ui/TxList/txList.spec.js +++ b/js-old/src/ui/TxList/txList.spec.js @@ -22,7 +22,7 @@ import Api from '~/api'; import TxList from './txList'; -const api = new Api({ execute: sinon.stub(), on: sinon.stub() }); +const api = new Api({ execute: sinon.stub() }); const STORE = { dispatch: sinon.stub(), diff --git a/js/src/ui/VaultCard/Layout/index.js b/js-old/src/ui/VaultCard/Layout/index.js similarity index 100% rename from js/src/ui/VaultCard/Layout/index.js rename to js-old/src/ui/VaultCard/Layout/index.js diff --git a/js/src/ui/VaultCard/Layout/layout.css b/js-old/src/ui/VaultCard/Layout/layout.css similarity index 100% rename from js/src/ui/VaultCard/Layout/layout.css rename to js-old/src/ui/VaultCard/Layout/layout.css diff --git a/js/src/ui/VaultCard/Layout/layout.js b/js-old/src/ui/VaultCard/Layout/layout.js similarity index 100% rename from js/src/ui/VaultCard/Layout/layout.js rename to js-old/src/ui/VaultCard/Layout/layout.js diff --git a/js/src/ui/VaultCard/Layout/layout.spec.js b/js-old/src/ui/VaultCard/Layout/layout.spec.js similarity index 100% rename from js/src/ui/VaultCard/Layout/layout.spec.js rename to js-old/src/ui/VaultCard/Layout/layout.spec.js diff --git a/js/src/ui/VaultCard/index.js b/js-old/src/ui/VaultCard/index.js similarity index 100% rename from js/src/ui/VaultCard/index.js rename to js-old/src/ui/VaultCard/index.js diff --git a/js/src/ui/VaultCard/vaultCard.css b/js-old/src/ui/VaultCard/vaultCard.css similarity index 100% rename from js/src/ui/VaultCard/vaultCard.css rename to js-old/src/ui/VaultCard/vaultCard.css diff --git a/js/src/ui/VaultCard/vaultCard.js b/js-old/src/ui/VaultCard/vaultCard.js similarity index 100% rename from js/src/ui/VaultCard/vaultCard.js rename to js-old/src/ui/VaultCard/vaultCard.js diff --git a/js/src/ui/VaultCard/vaultCard.spec.js b/js-old/src/ui/VaultCard/vaultCard.spec.js similarity index 100% rename from js/src/ui/VaultCard/vaultCard.spec.js rename to js-old/src/ui/VaultCard/vaultCard.spec.js diff --git a/js/src/ui/VaultTag/index.js b/js-old/src/ui/VaultTag/index.js similarity index 100% rename from js/src/ui/VaultTag/index.js rename to js-old/src/ui/VaultTag/index.js diff --git a/js/src/ui/VaultTag/vaultTag.css b/js-old/src/ui/VaultTag/vaultTag.css similarity index 100% rename from js/src/ui/VaultTag/vaultTag.css rename to js-old/src/ui/VaultTag/vaultTag.css diff --git a/js/src/ui/VaultTag/vaultTag.js b/js-old/src/ui/VaultTag/vaultTag.js similarity index 100% rename from js/src/ui/VaultTag/vaultTag.js rename to js-old/src/ui/VaultTag/vaultTag.js diff --git a/js/src/ui/Warning/index.js b/js-old/src/ui/Warning/index.js similarity index 100% rename from js/src/ui/Warning/index.js rename to js-old/src/ui/Warning/index.js diff --git a/js/src/ui/Warning/warning.css b/js-old/src/ui/Warning/warning.css similarity index 100% rename from js/src/ui/Warning/warning.css rename to js-old/src/ui/Warning/warning.css diff --git a/js/src/ui/Warning/warning.js b/js-old/src/ui/Warning/warning.js similarity index 100% rename from js/src/ui/Warning/warning.js rename to js-old/src/ui/Warning/warning.js diff --git a/js/src/ui/index.js b/js-old/src/ui/index.js similarity index 100% rename from js/src/ui/index.js rename to js-old/src/ui/index.js diff --git a/js/src/util/abi.js b/js-old/src/util/abi.js similarity index 100% rename from js/src/util/abi.js rename to js-old/src/util/abi.js diff --git a/js/src/util/array.js b/js-old/src/util/array.js similarity index 100% rename from js/src/util/array.js rename to js-old/src/util/array.js diff --git a/js/src/util/array.spec.js b/js-old/src/util/array.spec.js similarity index 100% rename from js/src/util/array.spec.js rename to js-old/src/util/array.spec.js diff --git a/js/src/util/constants.js b/js-old/src/util/constants.js similarity index 100% rename from js/src/util/constants.js rename to js-old/src/util/constants.js diff --git a/js/src/util/dapplink.js b/js-old/src/util/dapplink.js similarity index 100% rename from js/src/util/dapplink.js rename to js-old/src/util/dapplink.js diff --git a/js/src/util/dapplink.spec.js b/js-old/src/util/dapplink.spec.js similarity index 100% rename from js/src/util/dapplink.spec.js rename to js-old/src/util/dapplink.spec.js diff --git a/js/src/util/dapps.js b/js-old/src/util/dapps.js similarity index 100% rename from js/src/util/dapps.js rename to js-old/src/util/dapps.js diff --git a/js/src/util/messages.js b/js-old/src/util/messages.js similarity index 100% rename from js/src/util/messages.js rename to js-old/src/util/messages.js diff --git a/js/src/util/notifications.js b/js-old/src/util/notifications.js similarity index 93% rename from js/src/util/notifications.js rename to js-old/src/util/notifications.js index d153b2ccefc4f50f6924ec8c6a1f70f3dfc1a9f0..74732cac25cf21dc6af73646438dfa6037b35471 100644 --- a/js/src/util/notifications.js +++ b/js-old/src/util/notifications.js @@ -17,12 +17,12 @@ import Push from 'push.js'; import BigNumber from 'bignumber.js'; -import unknownIcon from '~/../assets/images/contracts/unknown-64x64.png'; +import unkownIcon from '~/../assets/images/contracts/unknown-64x64.png'; export function notifyTransaction (account, token, _value, onClick) { const name = account.name || account.address; const value = _value.div(new BigNumber(token.format || 1)); - const icon = token.image || unknownIcon; + const icon = token.image || unkownIcon; let _notification = null; diff --git a/js/src/util/proptypes.js b/js-old/src/util/proptypes.js similarity index 100% rename from js/src/util/proptypes.js rename to js-old/src/util/proptypes.js diff --git a/js/src/util/qrscan.js b/js-old/src/util/qrscan.js similarity index 100% rename from js/src/util/qrscan.js rename to js-old/src/util/qrscan.js diff --git a/js/src/util/signer.js b/js-old/src/util/signer.js similarity index 100% rename from js/src/util/signer.js rename to js-old/src/util/signer.js diff --git a/js/src/util/solidity.js b/js-old/src/util/solidity.js similarity index 100% rename from js/src/util/solidity.js rename to js-old/src/util/solidity.js diff --git a/js/src/util/subscribe-to-events.js b/js-old/src/util/subscribe-to-events.js similarity index 100% rename from js/src/util/subscribe-to-events.js rename to js-old/src/util/subscribe-to-events.js diff --git a/js/src/util/subscribe-to-events.spec.js b/js-old/src/util/subscribe-to-events.spec.js similarity index 100% rename from js/src/util/subscribe-to-events.spec.js rename to js-old/src/util/subscribe-to-events.spec.js diff --git a/js/src/util/subscribe-to-events.test.js b/js-old/src/util/subscribe-to-events.test.js similarity index 100% rename from js/src/util/subscribe-to-events.test.js rename to js-old/src/util/subscribe-to-events.test.js diff --git a/js-old/src/util/tokens.js b/js-old/src/util/tokens.js new file mode 100644 index 0000000000000000000000000000000000000000..63e6e9f02d6e4e84f1dc6193fe9fe947b3811419 --- /dev/null +++ b/js-old/src/util/tokens.js @@ -0,0 +1,133 @@ +// 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 . + +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}`); + }); +} diff --git a/js/src/util/tx.js b/js-old/src/util/tx.js similarity index 98% rename from js/src/util/tx.js rename to js-old/src/util/tx.js index d5dae650da1ba63e4d996087803b6f183bf4e376..e325e6024045f34e1a0ba43bc57ce59940278a14 100644 --- a/js/src/util/tx.js +++ b/js-old/src/util/tx.js @@ -81,11 +81,12 @@ export function getTxOptions (api, func, _options, values = []) { options.to = options.to || func.contract.address; } - const promise = (!address) - ? Promise.resolve(false) - : WalletsUtils.isWallet(api, address); + if (!address) { + return Promise.resolve({ func, options, values }); + } - return promise + return WalletsUtils + .isWallet(api, address) .then((isWallet) => { if (!isWallet) { return { func, options, values }; diff --git a/js/src/util/validation.js b/js-old/src/util/validation.js similarity index 100% rename from js/src/util/validation.js rename to js-old/src/util/validation.js diff --git a/js/src/util/validation.spec.js b/js-old/src/util/validation.spec.js similarity index 100% rename from js/src/util/validation.spec.js rename to js-old/src/util/validation.spec.js diff --git a/js/src/util/wallets.js b/js-old/src/util/wallets.js similarity index 90% rename from js/src/util/wallets.js rename to js-old/src/util/wallets.js index 9f22ef262ab6e563d57c5a9c4330a74cbc342226..6b1c29d01c05aece9790cce376809f752a4fcdd1 100644 --- a/js/src/util/wallets.js +++ b/js-old/src/util/wallets.js @@ -78,39 +78,13 @@ export default class WalletsUtils { .delegateCall(api, walletContract.address, 'fetchTransactions', [ walletContract ]) .then((transactions) => { return transactions.sort((txA, txB) => { - const bnA = txA.blockNumber; - const bnB = txB.blockNumber; - - if (!bnA) { - console.warn('could not find block number in transaction', txA); - return 1; - } - - if (!bnB) { - console.warn('could not find block number in transaction', txB); - return -1; - } - - const comp = bnA.comparedTo(bnB); + const comp = txB.blockNumber.comparedTo(txA.blockNumber); if (comp !== 0) { return comp; } - const txIdxA = txA.transactionIndex; - const txIdxB = txB.transactionIndex; - - if (!txIdxA) { - console.warn('could not find transaction index in transaction', txA); - return 1; - } - - if (!txIdxB) { - console.warn('could not find transaction index in transaction', txB); - return -1; - } - - return txIdxA.comparedTo(txIdxB); + return txB.transactionIndex.comparedTo(txA.transactionIndex); }); }); } diff --git a/js/src/util/wallets/consensys-wallet.js b/js-old/src/util/wallets/consensys-wallet.js similarity index 99% rename from js/src/util/wallets/consensys-wallet.js rename to js-old/src/util/wallets/consensys-wallet.js index bfc8cb679a047ae0d1301baaa60808850e8c8d37..9f9f9d5fa4e928aef79b384249024b5d1dd55d1f 100644 --- a/js/src/util/wallets/consensys-wallet.js +++ b/js-old/src/util/wallets/consensys-wallet.js @@ -212,7 +212,6 @@ export default class ConsensysWalletUtils { const transaction = { transactionHash: log.transactionHash, - transactionIndex: log.transactionIndex, blockNumber: log.blockNumber }; diff --git a/js/src/util/wallets/foundation-wallet.js b/js-old/src/util/wallets/foundation-wallet.js similarity index 81% rename from js/src/util/wallets/foundation-wallet.js rename to js-old/src/util/wallets/foundation-wallet.js index 926b40a8083e0933ed72249769dee8b6be38b06e..4fb1cfe220787503035ebed50b0bbf2438d6f431 100644 --- a/js/src/util/wallets/foundation-wallet.js +++ b/js-old/src/util/wallets/foundation-wallet.js @@ -130,67 +130,27 @@ export default class FoundationWalletUtils { .ConfirmationNeeded .getAllLogs() .then((logs) => { - return logs - .filter((log) => { - if (!log.blockNumber) { - console.warn('got a log without blockNumber', log); - return false; - } - - if (!log.transactionIndex) { - console.warn('got a log without transactionIndex', log); - return false; - } - - return true; - }) - .map((log) => ({ - initiator: log.params.initiator.value, - to: log.params.to.value, - data: log.params.data.value, - value: log.params.value.value, - operation: bytesToHex(log.params.operation.value), - transactionIndex: log.transactionIndex, - transactionHash: log.transactionHash, - blockNumber: log.blockNumber, - confirmedBy: [] - })); + return logs.map((log) => ({ + initiator: log.params.initiator.value, + to: log.params.to.value, + data: log.params.data.value, + value: log.params.value.value, + operation: bytesToHex(log.params.operation.value), + transactionIndex: log.transactionIndex, + transactionHash: log.transactionHash, + blockNumber: log.blockNumber, + confirmedBy: [] + })); }) .then((logs) => { return logs.sort((logA, logB) => { - const bnA = logA.blockNumber; - const bnB = logA.blockNumber; - - if (!bnA) { - console.warn('could not find block number in log', logA); - return 1; - } - - if (!bnB) { - console.warn('could not find block number in log', logB); - return -1; - } - - const comp = bnA.comparedTo(bnB); + const comp = logA.blockNumber.comparedTo(logB.blockNumber); if (comp !== 0) { return comp; } - const txIdxA = logA.transactionIndex; - const txIdxB = logB.transactionIndex; - - if (!txIdxA) { - console.warn('could not find transaction index in log', logA); - return 1; - } - - if (!txIdxB) { - console.warn('could not find transaction index in log', logB); - return -1; - } - - return txIdxA.comparedTo(txIdxB); + return logA.transactionIndex.comparedTo(logB.transactionIndex); }); }) .then((pendingTxs) => { @@ -245,48 +205,40 @@ export default class FoundationWalletUtils { ] ] }) .then((logs) => { - const transactions = logs - .map((log) => { - const signature = toHex(log.topics[0]); - - const value = log.params.value.value; - const from = signature === WalletSignatures.Deposit - ? log.params['_from'].value - : walletContract.address; - - const to = signature === WalletSignatures.Deposit - ? walletContract.address - : log.params.to.value; - - const transaction = { - transactionHash: log.transactionHash, - transactionIndex: log.transactionIndex, - blockNumber: log.blockNumber, - from, to, value - }; - - if (!transaction.blockNumber) { - console.warn('log without block number', log); - return null; - } + const transactions = logs.map((log) => { + const signature = toHex(log.topics[0]); - if (log.params.created && log.params.created.value && !/^(0x)?0*$/.test(log.params.created.value)) { - transaction.creates = log.params.created.value; - delete transaction.to; - } + const value = log.params.value.value; + const from = signature === WalletSignatures.Deposit + ? log.params['_from'].value + : walletContract.address; - if (log.params.operation) { - transaction.operation = bytesToHex(log.params.operation.value); - checkPendingOperation(api, log, transaction.operation); - } + const to = signature === WalletSignatures.Deposit + ? walletContract.address + : log.params.to.value; - if (log.params.data) { - transaction.data = log.params.data.value; - } + const transaction = { + transactionHash: log.transactionHash, + blockNumber: log.blockNumber, + from, to, value + }; - return transaction; - }) - .filter((tx) => tx); + if (log.params.created && log.params.created.value && !/^(0x)?0*$/.test(log.params.created.value)) { + transaction.creates = log.params.created.value; + delete transaction.to; + } + + if (log.params.operation) { + transaction.operation = bytesToHex(log.params.operation.value); + checkPendingOperation(api, log, transaction.operation); + } + + if (log.params.data) { + transaction.data = log.params.data.value; + } + + return transaction; + }); return transactions; }); diff --git a/js/src/util/wallets/pending-contracts.js b/js-old/src/util/wallets/pending-contracts.js similarity index 100% rename from js/src/util/wallets/pending-contracts.js rename to js-old/src/util/wallets/pending-contracts.js diff --git a/js/src/util/wallets/updates.js b/js-old/src/util/wallets/updates.js similarity index 100% rename from js/src/util/wallets/updates.js rename to js-old/src/util/wallets/updates.js diff --git a/js/src/util/web3.extensions.js b/js-old/src/util/web3.extensions.js similarity index 100% rename from js/src/util/web3.extensions.js rename to js-old/src/util/web3.extensions.js diff --git a/js/src/views/Account/Header/header.css b/js-old/src/views/Account/Header/header.css similarity index 100% rename from js/src/views/Account/Header/header.css rename to js-old/src/views/Account/Header/header.css diff --git a/js/src/views/Account/Header/header.js b/js-old/src/views/Account/Header/header.js similarity index 100% rename from js/src/views/Account/Header/header.js rename to js-old/src/views/Account/Header/header.js diff --git a/js/src/views/Account/Header/header.spec.js b/js-old/src/views/Account/Header/header.spec.js similarity index 100% rename from js/src/views/Account/Header/header.spec.js rename to js-old/src/views/Account/Header/header.spec.js diff --git a/js/src/views/Account/Header/index.js b/js-old/src/views/Account/Header/index.js similarity index 100% rename from js/src/views/Account/Header/index.js rename to js-old/src/views/Account/Header/index.js diff --git a/js/src/views/Account/Transactions/index.js b/js-old/src/views/Account/Transactions/index.js similarity index 100% rename from js/src/views/Account/Transactions/index.js rename to js-old/src/views/Account/Transactions/index.js diff --git a/js/src/views/Account/Transactions/store.js b/js-old/src/views/Account/Transactions/store.js similarity index 100% rename from js/src/views/Account/Transactions/store.js rename to js-old/src/views/Account/Transactions/store.js diff --git a/js/src/views/Account/Transactions/store.spec.js b/js-old/src/views/Account/Transactions/store.spec.js similarity index 100% rename from js/src/views/Account/Transactions/store.spec.js rename to js-old/src/views/Account/Transactions/store.spec.js diff --git a/js/src/views/Account/Transactions/transactions.css b/js-old/src/views/Account/Transactions/transactions.css similarity index 100% rename from js/src/views/Account/Transactions/transactions.css rename to js-old/src/views/Account/Transactions/transactions.css diff --git a/js/src/views/Account/Transactions/transactions.js b/js-old/src/views/Account/Transactions/transactions.js similarity index 100% rename from js/src/views/Account/Transactions/transactions.js rename to js-old/src/views/Account/Transactions/transactions.js diff --git a/js/src/views/Account/Transactions/transactions.spec.js b/js-old/src/views/Account/Transactions/transactions.spec.js similarity index 100% rename from js/src/views/Account/Transactions/transactions.spec.js rename to js-old/src/views/Account/Transactions/transactions.spec.js diff --git a/js/src/views/Account/Transactions/transactions.test.js b/js-old/src/views/Account/Transactions/transactions.test.js similarity index 100% rename from js/src/views/Account/Transactions/transactions.test.js rename to js-old/src/views/Account/Transactions/transactions.test.js diff --git a/js/src/views/Account/account.css b/js-old/src/views/Account/account.css similarity index 100% rename from js/src/views/Account/account.css rename to js-old/src/views/Account/account.css diff --git a/js/src/views/Account/account.js b/js-old/src/views/Account/account.js similarity index 95% rename from js/src/views/Account/account.js rename to js-old/src/views/Account/account.js index 50ad70164bd7e2c792d9b06cb189b58b9e809ebc..fdccac793bd233de618274d3ee92a32d6865cd93 100644 --- a/js/src/views/Account/account.js +++ b/js-old/src/views/Account/account.js @@ -26,6 +26,7 @@ import HardwareStore from '~/mobx/hardwareStore'; import ExportStore from '~/modals/ExportAccount/exportStore'; import { DeleteAccount, EditMeta, Faucet, PasswordManager, Shapeshift, Transfer, Verification } from '~/modals'; import { setVisibleAccounts } from '~/redux/providers/personalActions'; +import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions'; import { Actionbar, Button, ConfirmDialog, Input, Page, Portal } from '~/ui'; import { DeleteIcon, DialIcon, EditIcon, LockedIcon, SendIcon, VerifyIcon, FileDownloadIcon } from '~/ui/Icons'; @@ -44,6 +45,8 @@ class Account extends Component { static propTypes = { accounts: PropTypes.object.isRequired, + fetchCertifiers: PropTypes.func.isRequired, + fetchCertifications: PropTypes.func.isRequired, setVisibleAccounts: PropTypes.func.isRequired, account: PropTypes.object, @@ -64,6 +67,7 @@ class Account extends Component { } componentDidMount () { + this.props.fetchCertifiers(); this.setVisibleAccounts(); } @@ -86,10 +90,11 @@ class Account extends Component { } setVisibleAccounts (props = this.props) { - const { params, setVisibleAccounts } = props; + const { params, setVisibleAccounts, fetchCertifications } = props; const addresses = [params.address]; setVisibleAccounts(addresses); + fetchCertifications(params.address); } render () { @@ -365,14 +370,14 @@ class Account extends Component { onDeny={ this.exportClose } title={ } >
@@ -383,13 +388,13 @@ class Account extends Component { type='password' hint={ } label={ } @@ -519,6 +524,8 @@ function mapStateToProps (state, props) { function mapDispatchToProps (dispatch) { return bindActionCreators({ + fetchCertifiers, + fetchCertifications, newError, setVisibleAccounts }, dispatch); diff --git a/js/src/views/Account/account.spec.js b/js-old/src/views/Account/account.spec.js similarity index 95% rename from js/src/views/Account/account.spec.js rename to js-old/src/views/Account/account.spec.js index d8037602987e079af4265cc96c59ca3d7b538816..6a96d63001d6c5d6509abc77dcd8daf35203573a 100644 --- a/js/src/views/Account/account.spec.js +++ b/js-old/src/views/Account/account.spec.js @@ -14,7 +14,6 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -import sinon from 'sinon'; import { shallow } from 'enzyme'; import React from 'react'; @@ -35,15 +34,7 @@ function render (props) { />, { context: { - store: createRedux(), - api: { - transport: { - on: sinon.stub() - }, - pubsub: { - subscribeAndGetResult: sinon.stub() - } - } + store: createRedux() } } ).find('Account').shallow(); diff --git a/js/src/views/Account/account.test.js b/js-old/src/views/Account/account.test.js similarity index 100% rename from js/src/views/Account/account.test.js rename to js-old/src/views/Account/account.test.js diff --git a/js/src/views/Account/index.js b/js-old/src/views/Account/index.js similarity index 100% rename from js/src/views/Account/index.js rename to js-old/src/views/Account/index.js diff --git a/js/src/views/Account/store.js b/js-old/src/views/Account/store.js similarity index 100% rename from js/src/views/Account/store.js rename to js-old/src/views/Account/store.js diff --git a/js/src/views/Account/store.spec.js b/js-old/src/views/Account/store.spec.js similarity index 100% rename from js/src/views/Account/store.spec.js rename to js-old/src/views/Account/store.spec.js diff --git a/js/src/views/Accounts/List/index.js b/js-old/src/views/Accounts/List/index.js similarity index 100% rename from js/src/views/Accounts/List/index.js rename to js-old/src/views/Accounts/List/index.js diff --git a/js/src/views/Accounts/List/list.css b/js-old/src/views/Accounts/List/list.css similarity index 100% rename from js/src/views/Accounts/List/list.css rename to js-old/src/views/Accounts/List/list.css diff --git a/js/src/views/Accounts/List/list.js b/js-old/src/views/Accounts/List/list.js similarity index 91% rename from js/src/views/Accounts/List/list.js rename to js-old/src/views/Accounts/List/list.js index 7ff04ab3056321bb6e6f3bda8330d61151a2cadb..2fa3be70b132d79f0171c1a400afe8b59a45b21f 100644 --- a/js/src/views/Accounts/List/list.js +++ b/js-old/src/views/Accounts/List/list.js @@ -17,8 +17,10 @@ import { pick } from 'lodash'; import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; +import { bindActionCreators } from 'redux'; import { Container, SectionList } from '~/ui'; +import { fetchCertifiers, fetchCertifications } from '~/redux/providers/certifications/actions'; import { ETH_TOKEN } from '~/util/tokens'; import Summary from '../Summary'; @@ -36,9 +38,20 @@ class List extends Component { orderFallback: PropTypes.string, search: PropTypes.array, + fetchCertifiers: PropTypes.func.isRequired, + fetchCertifications: PropTypes.func.isRequired, handleAddSearchToken: PropTypes.func }; + componentWillMount () { + const { accounts, fetchCertifiers, fetchCertifications } = this.props; + + fetchCertifiers(); + for (let address in accounts) { + fetchCertifications(address); + } + } + render () { const { accounts, disabled, empty } = this.props; @@ -251,7 +264,14 @@ function mapStateToProps (state, props) { return { balances, certifications }; } +function mapDispatchToProps (dispatch) { + return bindActionCreators({ + fetchCertifiers, + fetchCertifications + }, dispatch); +} + export default connect( mapStateToProps, - null + mapDispatchToProps )(List); diff --git a/js/src/views/Accounts/Summary/index.js b/js-old/src/views/Accounts/Summary/index.js similarity index 100% rename from js/src/views/Accounts/Summary/index.js rename to js-old/src/views/Accounts/Summary/index.js diff --git a/js/src/views/Accounts/Summary/summary.js b/js-old/src/views/Accounts/Summary/summary.js similarity index 100% rename from js/src/views/Accounts/Summary/summary.js rename to js-old/src/views/Accounts/Summary/summary.js diff --git a/js/src/views/Accounts/accounts.css b/js-old/src/views/Accounts/accounts.css similarity index 100% rename from js/src/views/Accounts/accounts.css rename to js-old/src/views/Accounts/accounts.css diff --git a/js/src/views/Accounts/accounts.js b/js-old/src/views/Accounts/accounts.js similarity index 100% rename from js/src/views/Accounts/accounts.js rename to js-old/src/views/Accounts/accounts.js diff --git a/js/src/views/Accounts/accounts.spec.js b/js-old/src/views/Accounts/accounts.spec.js similarity index 95% rename from js/src/views/Accounts/accounts.spec.js rename to js-old/src/views/Accounts/accounts.spec.js index 3fad02643f0172990bc04793c2d35b495b901d21..3c6ab943954ebb907dd4fa0823221740f8b59905 100644 --- a/js/src/views/Accounts/accounts.spec.js +++ b/js-old/src/views/Accounts/accounts.spec.js @@ -27,11 +27,7 @@ let instance; let redux; function createApi () { - api = { - pubsub: { - subscribeAndGetResult: sinon.stub().returns(Promise.reject(new Error('uninitialized'))) - } - }; + api = {}; return api; } diff --git a/js/src/views/Accounts/index.js b/js-old/src/views/Accounts/index.js similarity index 100% rename from js/src/views/Accounts/index.js rename to js-old/src/views/Accounts/index.js diff --git a/js/src/views/Address/Delete/delete.js b/js-old/src/views/Address/Delete/delete.js similarity index 100% rename from js/src/views/Address/Delete/delete.js rename to js-old/src/views/Address/Delete/delete.js diff --git a/js/src/views/Address/Delete/index.js b/js-old/src/views/Address/Delete/index.js similarity index 100% rename from js/src/views/Address/Delete/index.js rename to js-old/src/views/Address/Delete/index.js diff --git a/js/src/views/Address/address.css b/js-old/src/views/Address/address.css similarity index 100% rename from js/src/views/Address/address.css rename to js-old/src/views/Address/address.css diff --git a/js/src/views/Address/address.js b/js-old/src/views/Address/address.js similarity index 100% rename from js/src/views/Address/address.js rename to js-old/src/views/Address/address.js diff --git a/js/src/views/Address/index.js b/js-old/src/views/Address/index.js similarity index 100% rename from js/src/views/Address/index.js rename to js-old/src/views/Address/index.js diff --git a/js/src/views/Addresses/addresses.css b/js-old/src/views/Addresses/addresses.css similarity index 100% rename from js/src/views/Addresses/addresses.css rename to js-old/src/views/Addresses/addresses.css diff --git a/js/src/views/Addresses/addresses.js b/js-old/src/views/Addresses/addresses.js similarity index 100% rename from js/src/views/Addresses/addresses.js rename to js-old/src/views/Addresses/addresses.js diff --git a/js/src/views/Addresses/index.js b/js-old/src/views/Addresses/index.js similarity index 100% rename from js/src/views/Addresses/index.js rename to js-old/src/views/Addresses/index.js diff --git a/js/src/views/Application/Container/container.js b/js-old/src/views/Application/Container/container.js similarity index 100% rename from js/src/views/Application/Container/container.js rename to js-old/src/views/Application/Container/container.js diff --git a/js/src/views/Application/Container/index.js b/js-old/src/views/Application/Container/index.js similarity index 100% rename from js/src/views/Application/Container/index.js rename to js-old/src/views/Application/Container/index.js diff --git a/js/src/views/Application/DappContainer/dappContainer.js b/js-old/src/views/Application/DappContainer/dappContainer.js similarity index 100% rename from js/src/views/Application/DappContainer/dappContainer.js rename to js-old/src/views/Application/DappContainer/dappContainer.js diff --git a/js/src/views/Application/DappContainer/index.js b/js-old/src/views/Application/DappContainer/index.js similarity index 100% rename from js/src/views/Application/DappContainer/index.js rename to js-old/src/views/Application/DappContainer/index.js diff --git a/js/src/views/Application/Extension/extension.css b/js-old/src/views/Application/Extension/extension.css similarity index 100% rename from js/src/views/Application/Extension/extension.css rename to js-old/src/views/Application/Extension/extension.css diff --git a/js/src/views/Application/Extension/extension.js b/js-old/src/views/Application/Extension/extension.js similarity index 100% rename from js/src/views/Application/Extension/extension.js rename to js-old/src/views/Application/Extension/extension.js diff --git a/js/src/views/Application/Extension/index.js b/js-old/src/views/Application/Extension/index.js similarity index 100% rename from js/src/views/Application/Extension/index.js rename to js-old/src/views/Application/Extension/index.js diff --git a/js/src/views/Application/Extension/store.js b/js-old/src/views/Application/Extension/store.js similarity index 82% rename from js/src/views/Application/Extension/store.js rename to js-old/src/views/Application/Extension/store.js index af4b1a2053424327ed12d48729bd66f531a5b471..d1df2eb5b65d4b3afc305513c7a7d7501380a488 100644 --- a/js/src/views/Application/Extension/store.js +++ b/js-old/src/views/Application/Extension/store.js @@ -39,6 +39,7 @@ export default class Store { constructor () { this.nextDisplay = store.get(NEXT_DISPLAY) || 0; + this.testInstall(); } @computed get showWarning () { @@ -58,29 +59,20 @@ export default class Store { store.set(NEXT_DISPLAY, this.nextDisplay); } - @action setShouldInstall = (status) => { - this.shouldInstall = status; - } - - testInstall = () => { - this.readStatus().then(this.setShouldInstall); + @action testInstall = () => { + this.shouldInstall = this.readStatus(); } readStatus = () => { - return new Promise((resolve, reject) => { - // Defer checking for the extension since it may not have loaded yet. - setTimeout(() => { - const hasExtension = Symbol.for('parity.extension') in window; - const ua = browser.analyze(navigator.userAgent || ''); - - if (hasExtension) { - this.setExtensionActive(); - return resolve(false); - } - - return resolve((ua || {}).name.toLowerCase() === 'chrome'); - }, 5000); - }); + const hasExtension = Symbol.for('parity.extension') in window; + const ua = browser.analyze(navigator.userAgent || ''); + + if (hasExtension) { + this.setExtensionActive(); + return false; + } + + return (ua || {}).name.toLowerCase() === 'chrome'; } installExtension = () => { diff --git a/js/src/views/Application/FrameError/frameError.css b/js-old/src/views/Application/FrameError/frameError.css similarity index 100% rename from js/src/views/Application/FrameError/frameError.css rename to js-old/src/views/Application/FrameError/frameError.css diff --git a/js/src/views/Application/FrameError/frameError.js b/js-old/src/views/Application/FrameError/frameError.js similarity index 100% rename from js/src/views/Application/FrameError/frameError.js rename to js-old/src/views/Application/FrameError/frameError.js diff --git a/js/src/views/Application/FrameError/index.js b/js-old/src/views/Application/FrameError/index.js similarity index 100% rename from js/src/views/Application/FrameError/index.js rename to js-old/src/views/Application/FrameError/index.js diff --git a/js/src/views/Application/Requests/index.js b/js-old/src/views/Application/Requests/index.js similarity index 100% rename from js/src/views/Application/Requests/index.js rename to js-old/src/views/Application/Requests/index.js diff --git a/js/src/views/Application/Requests/requests.css b/js-old/src/views/Application/Requests/requests.css similarity index 100% rename from js/src/views/Application/Requests/requests.css rename to js-old/src/views/Application/Requests/requests.css diff --git a/js/src/views/Application/Requests/requests.js b/js-old/src/views/Application/Requests/requests.js similarity index 97% rename from js/src/views/Application/Requests/requests.js rename to js-old/src/views/Application/Requests/requests.js index 81635fd2d0053515d696fd934451cb1bfaf184bf..dfbb866b9061855535afc6b0608430444d576e55 100644 --- a/js/src/views/Application/Requests/requests.js +++ b/js-old/src/views/Application/Requests/requests.js @@ -57,11 +57,6 @@ class Requests extends Component { renderRequest (request, extras = {}) { const { show, transaction } = request; - - if (!transaction) { - return null; - } - const state = this.getTransactionState(request); const displayedTransaction = { ...transaction }; @@ -161,9 +156,9 @@ class Requests extends Component { return ( diff --git a/js/src/views/Application/Requests/savedRequests.js b/js-old/src/views/Application/Requests/savedRequests.js similarity index 100% rename from js/src/views/Application/Requests/savedRequests.js rename to js-old/src/views/Application/Requests/savedRequests.js diff --git a/js/src/views/Application/Requests/savedRequests.spec.js b/js-old/src/views/Application/Requests/savedRequests.spec.js similarity index 100% rename from js/src/views/Application/Requests/savedRequests.spec.js rename to js-old/src/views/Application/Requests/savedRequests.spec.js diff --git a/js/src/views/Application/Snackbar/index.js b/js-old/src/views/Application/Snackbar/index.js similarity index 100% rename from js/src/views/Application/Snackbar/index.js rename to js-old/src/views/Application/Snackbar/index.js diff --git a/js/src/views/Application/Snackbar/snackbar.js b/js-old/src/views/Application/Snackbar/snackbar.js similarity index 100% rename from js/src/views/Application/Snackbar/snackbar.js rename to js-old/src/views/Application/Snackbar/snackbar.js diff --git a/js/src/views/Application/Status/index.js b/js-old/src/views/Application/Status/index.js similarity index 100% rename from js/src/views/Application/Status/index.js rename to js-old/src/views/Application/Status/index.js diff --git a/js/src/views/Application/Status/status.css b/js-old/src/views/Application/Status/status.css similarity index 100% rename from js/src/views/Application/Status/status.css rename to js-old/src/views/Application/Status/status.css diff --git a/js/src/views/Application/Status/status.js b/js-old/src/views/Application/Status/status.js similarity index 100% rename from js/src/views/Application/Status/status.js rename to js-old/src/views/Application/Status/status.js diff --git a/js/src/views/Application/TabBar/Tab/index.js b/js-old/src/views/Application/TabBar/Tab/index.js similarity index 100% rename from js/src/views/Application/TabBar/Tab/index.js rename to js-old/src/views/Application/TabBar/Tab/index.js diff --git a/js/src/views/Application/TabBar/Tab/tab.js b/js-old/src/views/Application/TabBar/Tab/tab.js similarity index 100% rename from js/src/views/Application/TabBar/Tab/tab.js rename to js-old/src/views/Application/TabBar/Tab/tab.js diff --git a/js/src/views/Application/TabBar/Tab/tabs.spec.js b/js-old/src/views/Application/TabBar/Tab/tabs.spec.js similarity index 100% rename from js/src/views/Application/TabBar/Tab/tabs.spec.js rename to js-old/src/views/Application/TabBar/Tab/tabs.spec.js diff --git a/js/src/views/Application/TabBar/index.js b/js-old/src/views/Application/TabBar/index.js similarity index 100% rename from js/src/views/Application/TabBar/index.js rename to js-old/src/views/Application/TabBar/index.js diff --git a/js/src/views/Application/TabBar/tabBar.css b/js-old/src/views/Application/TabBar/tabBar.css similarity index 100% rename from js/src/views/Application/TabBar/tabBar.css rename to js-old/src/views/Application/TabBar/tabBar.css diff --git a/js/src/views/Application/TabBar/tabBar.js b/js-old/src/views/Application/TabBar/tabBar.js similarity index 100% rename from js/src/views/Application/TabBar/tabBar.js rename to js-old/src/views/Application/TabBar/tabBar.js diff --git a/js/src/views/Application/TabBar/tabBar.spec.js b/js-old/src/views/Application/TabBar/tabBar.spec.js similarity index 100% rename from js/src/views/Application/TabBar/tabBar.spec.js rename to js-old/src/views/Application/TabBar/tabBar.spec.js diff --git a/js/src/views/Application/application.css b/js-old/src/views/Application/application.css similarity index 100% rename from js/src/views/Application/application.css rename to js-old/src/views/Application/application.css diff --git a/js/src/views/Application/application.js b/js-old/src/views/Application/application.js similarity index 90% rename from js/src/views/Application/application.js rename to js-old/src/views/Application/application.js index 9c251abb55a46a4309415ce33154fc5d4dd5f025..5566253b810501c9f351ffccf3940cb301604839 100644 --- a/js/src/views/Application/application.js +++ b/js-old/src/views/Application/application.js @@ -19,8 +19,6 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; import UpgradeStore from '~/modals/UpgradeParity/store'; -import { PinMatrix } from '~/modals'; -import HardwareStore from '~/mobx/hardwareStore'; import Connection from '../Connection'; import ParityBar from '../ParityBar'; @@ -54,15 +52,12 @@ class Application extends Component { pending: PropTypes.array } - hwstore = HardwareStore.get(this.context.api); - store = new Store(this.context.api); upgradeStore = UpgradeStore.get(this.context.api); render () { const [root] = (window.location.hash || '').replace('#/', '').split('/'); const isMinimized = root === 'app' || root === 'web'; - const { pinMatrixRequest } = this.hwstore; if (process.env.NODE_ENV !== 'production' && root === 'playground') { return ( @@ -72,14 +67,13 @@ class Application extends Component { ); } - if (inFrame) { - return ( - - ); - } - return (
+ { + inFrame + ? + : null + } { isMinimized ? this.renderMinimized() @@ -91,7 +85,6 @@ class Application extends Component { : null } - { (pinMatrixRequest.length > 0) ? : null }
diff --git a/js/src/views/Application/index.js b/js-old/src/views/Application/index.js similarity index 100% rename from js/src/views/Application/index.js rename to js-old/src/views/Application/index.js diff --git a/js/src/views/Application/store.js b/js-old/src/views/Application/store.js similarity index 100% rename from js/src/views/Application/store.js rename to js-old/src/views/Application/store.js diff --git a/js/src/views/Connection/connection.css b/js-old/src/views/Connection/connection.css similarity index 100% rename from js/src/views/Connection/connection.css rename to js-old/src/views/Connection/connection.css diff --git a/js/src/views/Connection/connection.js b/js-old/src/views/Connection/connection.js similarity index 100% rename from js/src/views/Connection/connection.js rename to js-old/src/views/Connection/connection.js diff --git a/js/src/views/Connection/connection.spec.js b/js-old/src/views/Connection/connection.spec.js similarity index 100% rename from js/src/views/Connection/connection.spec.js rename to js-old/src/views/Connection/connection.spec.js diff --git a/js/src/views/Connection/index.js b/js-old/src/views/Connection/index.js similarity index 100% rename from js/src/views/Connection/index.js rename to js-old/src/views/Connection/index.js diff --git a/js/src/views/Contract/Events/Event/event.js b/js-old/src/views/Contract/Events/Event/event.js similarity index 100% rename from js/src/views/Contract/Events/Event/event.js rename to js-old/src/views/Contract/Events/Event/event.js diff --git a/js/src/views/Contract/Events/Event/index.js b/js-old/src/views/Contract/Events/Event/index.js similarity index 100% rename from js/src/views/Contract/Events/Event/index.js rename to js-old/src/views/Contract/Events/Event/index.js diff --git a/js/src/views/Contract/Events/events.js b/js-old/src/views/Contract/Events/events.js similarity index 100% rename from js/src/views/Contract/Events/events.js rename to js-old/src/views/Contract/Events/events.js diff --git a/js/src/views/Contract/Events/index.js b/js-old/src/views/Contract/Events/index.js similarity index 100% rename from js/src/views/Contract/Events/index.js rename to js-old/src/views/Contract/Events/index.js diff --git a/js/src/views/Contract/Queries/index.js b/js-old/src/views/Contract/Queries/index.js similarity index 100% rename from js/src/views/Contract/Queries/index.js rename to js-old/src/views/Contract/Queries/index.js diff --git a/js/src/views/Contract/Queries/inputQuery.js b/js-old/src/views/Contract/Queries/inputQuery.js similarity index 97% rename from js/src/views/Contract/Queries/inputQuery.js rename to js-old/src/views/Contract/Queries/inputQuery.js index 0e8b043d07ca4bf37fb7f0b80f1366751ef31d9e..7a75727f6e54ffc92f25405314e0e6c647b8df43 100644 --- a/js/src/views/Contract/Queries/inputQuery.js +++ b/js-old/src/views/Contract/Queries/inputQuery.js @@ -35,6 +35,7 @@ class InputQuery extends Component { }; static propTypes = { + accountsInfo: PropTypes.object.isRequired, contract: PropTypes.object.isRequired, inputs: arrayOrObjectProptype().isRequired, outputs: arrayOrObjectProptype().isRequired, @@ -121,7 +122,7 @@ class InputQuery extends Component { renderResults () { const { results, isLoading } = this.state; - const { outputs } = this.props; + const { accountsInfo, outputs } = this.props; if (isLoading) { return ( @@ -142,6 +143,7 @@ class InputQuery extends Component { .map((out, index) => { const input = ( @@ -528,11 +530,12 @@ class Contract extends Component { } function mapStateToProps (state) { - const { accounts, contracts } = state.personal; + const { accounts, accountsInfo, contracts } = state.personal; const { netVersion } = state.nodeStatus; return { accounts, + accountsInfo, contracts, netVersion }; diff --git a/js/src/views/Contract/index.js b/js-old/src/views/Contract/index.js similarity index 100% rename from js/src/views/Contract/index.js rename to js-old/src/views/Contract/index.js diff --git a/js/src/views/Contracts/contracts.js b/js-old/src/views/Contracts/contracts.js similarity index 100% rename from js/src/views/Contracts/contracts.js rename to js-old/src/views/Contracts/contracts.js diff --git a/js/src/views/Contracts/index.js b/js-old/src/views/Contracts/index.js similarity index 100% rename from js/src/views/Contracts/index.js rename to js-old/src/views/Contracts/index.js diff --git a/js/src/views/Dapp/dapp.css b/js-old/src/views/Dapp/dapp.css similarity index 100% rename from js/src/views/Dapp/dapp.css rename to js-old/src/views/Dapp/dapp.css diff --git a/js/src/views/Dapp/dapp.js b/js-old/src/views/Dapp/dapp.js similarity index 100% rename from js/src/views/Dapp/dapp.js rename to js-old/src/views/Dapp/dapp.js diff --git a/js/src/views/Dapp/index.js b/js-old/src/views/Dapp/index.js similarity index 100% rename from js/src/views/Dapp/index.js rename to js-old/src/views/Dapp/index.js diff --git a/js/src/views/Dapps/builtin.json b/js-old/src/views/Dapps/builtin.json similarity index 100% rename from js/src/views/Dapps/builtin.json rename to js-old/src/views/Dapps/builtin.json diff --git a/js/src/views/Dapps/dappStore.spec.js b/js-old/src/views/Dapps/dappStore.spec.js similarity index 100% rename from js/src/views/Dapps/dappStore.spec.js rename to js-old/src/views/Dapps/dappStore.spec.js diff --git a/js/src/views/Dapps/dapps.css b/js-old/src/views/Dapps/dapps.css similarity index 100% rename from js/src/views/Dapps/dapps.css rename to js-old/src/views/Dapps/dapps.css diff --git a/js/src/views/Dapps/dapps.js b/js-old/src/views/Dapps/dapps.js similarity index 100% rename from js/src/views/Dapps/dapps.js rename to js-old/src/views/Dapps/dapps.js diff --git a/js/src/views/Dapps/dappsStore.js b/js-old/src/views/Dapps/dappsStore.js similarity index 100% rename from js/src/views/Dapps/dappsStore.js rename to js-old/src/views/Dapps/dappsStore.js diff --git a/js/src/views/Dapps/index.js b/js-old/src/views/Dapps/index.js similarity index 100% rename from js/src/views/Dapps/index.js rename to js-old/src/views/Dapps/index.js diff --git a/js/src/views/Home/Accounts/accounts.css b/js-old/src/views/Home/Accounts/accounts.css similarity index 100% rename from js/src/views/Home/Accounts/accounts.css rename to js-old/src/views/Home/Accounts/accounts.css diff --git a/js/src/views/Home/Accounts/accounts.js b/js-old/src/views/Home/Accounts/accounts.js similarity index 100% rename from js/src/views/Home/Accounts/accounts.js rename to js-old/src/views/Home/Accounts/accounts.js diff --git a/js/src/views/Home/Accounts/accounts.spec.js b/js-old/src/views/Home/Accounts/accounts.spec.js similarity index 100% rename from js/src/views/Home/Accounts/accounts.spec.js rename to js-old/src/views/Home/Accounts/accounts.spec.js diff --git a/js/src/views/Home/Accounts/index.js b/js-old/src/views/Home/Accounts/index.js similarity index 100% rename from js/src/views/Home/Accounts/index.js rename to js-old/src/views/Home/Accounts/index.js diff --git a/js/src/views/Home/Dapps/dapp.js b/js-old/src/views/Home/Dapps/dapp.js similarity index 93% rename from js/src/views/Home/Dapps/dapp.js rename to js-old/src/views/Home/Dapps/dapp.js index c6be2c52ffca598da17f9d14d0be477d1ec82c87..51e5c21220b1be7f7c180288af885ab742ae3a48 100644 --- a/js/src/views/Home/Dapps/dapp.js +++ b/js-old/src/views/Home/Dapps/dapp.js @@ -35,14 +35,9 @@ export default class Dapp extends Component { } componentWillMount () { - this.isInactive = false; return this.loadApp(); } - componentWillUnmount () { - this.isInactive = true; - } - render () { const { id, timestamp } = this.props; const { dapp } = this.state; @@ -88,10 +83,6 @@ export default class Dapp extends Component { return store .loadApp(id) .then((dapp) => { - if (this.isInactive) { - return; - } - this.setState({ dapp }); }); } diff --git a/js/src/views/Home/Dapps/dapp.spec.js b/js-old/src/views/Home/Dapps/dapp.spec.js similarity index 100% rename from js/src/views/Home/Dapps/dapp.spec.js rename to js-old/src/views/Home/Dapps/dapp.spec.js diff --git a/js/src/views/Home/Dapps/dapps.css b/js-old/src/views/Home/Dapps/dapps.css similarity index 100% rename from js/src/views/Home/Dapps/dapps.css rename to js-old/src/views/Home/Dapps/dapps.css diff --git a/js/src/views/Home/Dapps/dapps.js b/js-old/src/views/Home/Dapps/dapps.js similarity index 100% rename from js/src/views/Home/Dapps/dapps.js rename to js-old/src/views/Home/Dapps/dapps.js diff --git a/js/src/views/Home/Dapps/dapps.spec.js b/js-old/src/views/Home/Dapps/dapps.spec.js similarity index 100% rename from js/src/views/Home/Dapps/dapps.spec.js rename to js-old/src/views/Home/Dapps/dapps.spec.js diff --git a/js/src/views/Home/Dapps/dapps.test.js b/js-old/src/views/Home/Dapps/dapps.test.js similarity index 100% rename from js/src/views/Home/Dapps/dapps.test.js rename to js-old/src/views/Home/Dapps/dapps.test.js diff --git a/js/src/views/Home/Dapps/index.js b/js-old/src/views/Home/Dapps/index.js similarity index 100% rename from js/src/views/Home/Dapps/index.js rename to js-old/src/views/Home/Dapps/index.js diff --git a/js/src/views/Home/News/index.js b/js-old/src/views/Home/News/index.js similarity index 100% rename from js/src/views/Home/News/index.js rename to js-old/src/views/Home/News/index.js diff --git a/js/src/views/Home/News/news.css b/js-old/src/views/Home/News/news.css similarity index 100% rename from js/src/views/Home/News/news.css rename to js-old/src/views/Home/News/news.css diff --git a/js/src/views/Home/News/news.js b/js-old/src/views/Home/News/news.js similarity index 100% rename from js/src/views/Home/News/news.js rename to js-old/src/views/Home/News/news.js diff --git a/js/src/views/Home/News/news.spec.js b/js-old/src/views/Home/News/news.spec.js similarity index 100% rename from js/src/views/Home/News/news.spec.js rename to js-old/src/views/Home/News/news.spec.js diff --git a/js/src/views/Home/News/news.test.js b/js-old/src/views/Home/News/news.test.js similarity index 100% rename from js/src/views/Home/News/news.test.js rename to js-old/src/views/Home/News/news.test.js diff --git a/js/src/views/Home/News/renderers.js b/js-old/src/views/Home/News/renderers.js similarity index 100% rename from js/src/views/Home/News/renderers.js rename to js-old/src/views/Home/News/renderers.js diff --git a/js/src/views/Home/News/store.js b/js-old/src/views/Home/News/store.js similarity index 100% rename from js/src/views/Home/News/store.js rename to js-old/src/views/Home/News/store.js diff --git a/js/src/views/Home/News/store.spec.js b/js-old/src/views/Home/News/store.spec.js similarity index 100% rename from js/src/views/Home/News/store.spec.js rename to js-old/src/views/Home/News/store.spec.js diff --git a/js/src/views/Home/Urls/index.js b/js-old/src/views/Home/Urls/index.js similarity index 100% rename from js/src/views/Home/Urls/index.js rename to js-old/src/views/Home/Urls/index.js diff --git a/js/src/views/Home/Urls/urls.css b/js-old/src/views/Home/Urls/urls.css similarity index 100% rename from js/src/views/Home/Urls/urls.css rename to js-old/src/views/Home/Urls/urls.css diff --git a/js/src/views/Home/Urls/urls.js b/js-old/src/views/Home/Urls/urls.js similarity index 100% rename from js/src/views/Home/Urls/urls.js rename to js-old/src/views/Home/Urls/urls.js diff --git a/js/src/views/Home/Urls/urls.spec.js b/js-old/src/views/Home/Urls/urls.spec.js similarity index 100% rename from js/src/views/Home/Urls/urls.spec.js rename to js-old/src/views/Home/Urls/urls.spec.js diff --git a/js/src/views/Home/home.css b/js-old/src/views/Home/home.css similarity index 100% rename from js/src/views/Home/home.css rename to js-old/src/views/Home/home.css diff --git a/js/src/views/Home/home.js b/js-old/src/views/Home/home.js similarity index 100% rename from js/src/views/Home/home.js rename to js-old/src/views/Home/home.js diff --git a/js/src/views/Home/home.spec.js b/js-old/src/views/Home/home.spec.js similarity index 100% rename from js/src/views/Home/home.spec.js rename to js-old/src/views/Home/home.spec.js diff --git a/js/src/views/Home/index.js b/js-old/src/views/Home/index.js similarity index 100% rename from js/src/views/Home/index.js rename to js-old/src/views/Home/index.js diff --git a/js-old/src/views/ParityBar/accountStore.js b/js-old/src/views/ParityBar/accountStore.js new file mode 100644 index 0000000000000000000000000000000000000000..3d4dbae9cf7868abee08d6a68674f40a23e6b50a --- /dev/null +++ b/js-old/src/views/ParityBar/accountStore.js @@ -0,0 +1,129 @@ +// 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 . + +import { action, observable, transaction } from 'mobx'; + +export default class AccountStore { + @observable accounts = []; + @observable defaultAccount = null; + @observable isLoading = false; + + constructor (api) { + this._api = api; + + this.loadDefaultAccount() + .then(() => this.loadAccounts()); + + this.subscribeDefaultAccount(); + } + + @action setAccounts = (accounts) => { + this.accounts = accounts; + } + + @action setDefaultAccount = (defaultAccount) => { + transaction(() => { + this.accounts = this.accounts.map((account) => { + account.checked = account.address === defaultAccount; + + return account; + }); + + this.defaultAccount = defaultAccount; + }); + } + + @action setLoading = (isLoading) => { + this.isLoading = isLoading; + } + + makeDefaultAccount = (defaultAddress) => { + this.setDefaultAccount(defaultAddress); + + return this._api.parity + .setNewDappsDefaultAddress(defaultAddress) + .catch((error) => { + console.warn('makeDefaultAccount', error); + }); + } + + loadDefaultAccount () { + return this._api.parity + .defaultAccount() + .then((address) => this.setDefaultAccount(address)); + } + + loadAccounts () { + this.setLoading(true); + + return Promise + .all([ + this._api.parity.getNewDappsAddresses(), + this._api.parity.allAccountsInfo() + ]) + .then(([whitelist, allAccounts]) => { + transaction(() => { + const accounts = Object + .keys(allAccounts) + .filter((address) => { + const account = allAccounts[address]; + const isAccount = account.uuid; + const isExternal = account.meta && (account.meta.external || account.meta.hardware); + const isWhitelisted = !whitelist || whitelist.includes(address); + + return (isAccount || isExternal) && isWhitelisted; + }) + .map((address) => { + return { + ...allAccounts[address], + checked: address === this.defaultAccount, + address + }; + }); + + this.setLoading(false); + this.setAccounts(accounts); + }); + }) + .catch((error) => { + this.setLoading(false); + console.warn('loadAccounts', error); + }); + } + + subscribeDefaultAccount () { + const promiseDefaultAccount = this._api.subscribe('parity_defaultAccount', (error, defaultAccount) => { + if (!error) { + this.setDefaultAccount(defaultAccount); + } + }); + + const promiseEthAccounts = this._api.subscribe('eth_accounts', (error) => { + if (!error) { + this.loadAccounts(); + } + }); + + const promiseAccountsInfo = this._api + .subscribe('parity_allAccountsInfo', (error, accountsInfo) => { + if (!error) { + this.loadAccounts(); + } + }); + + return Promise.all([ promiseDefaultAccount, promiseEthAccounts, promiseAccountsInfo ]); + } +} diff --git a/js-old/src/views/ParityBar/accountStore.spec.js b/js-old/src/views/ParityBar/accountStore.spec.js new file mode 100644 index 0000000000000000000000000000000000000000..16cebf9e12bd6e73d5d2d2498c139229f5fe248d --- /dev/null +++ b/js-old/src/views/ParityBar/accountStore.spec.js @@ -0,0 +1,112 @@ +// 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 . + +import sinon from 'sinon'; + +import AccountStore from './accountStore'; + +import { ACCOUNT_DEFAULT, ACCOUNT_NEW, createApi } from './parityBar.test.js'; + +let api; +let store; + +function create () { + api = createApi(); + store = new AccountStore(api); + + return store; +} + +describe('views/ParityBar/AccountStore', () => { + beforeEach(() => { + create(); + }); + + describe('constructor', () => { + it('subscribes to defaultAccount', () => { + expect(api.subscribe).to.have.been.calledWith('parity_defaultAccount'); + }); + }); + + describe('@action', () => { + describe('setAccounts', () => { + it('sets the accounts', () => { + store.setAccounts('testing'); + expect(store.accounts).to.equal('testing'); + }); + }); + + describe('setDefaultAccount', () => { + it('sets the default account', () => { + store.setDefaultAccount('testing'); + expect(store.defaultAccount).to.equal('testing'); + }); + }); + + describe('setLoading', () => { + it('sets the loading status', () => { + store.setLoading('testing'); + expect(store.isLoading).to.equal('testing'); + }); + }); + }); + + describe('operations', () => { + describe('loadAccounts', () => { + beforeEach(() => { + sinon.spy(store, 'setAccounts'); + + return store.loadAccounts(); + }); + + afterEach(() => { + store.setAccounts.restore(); + }); + + it('calls into parity_getNewDappsAddresses', () => { + expect(api.parity.getNewDappsAddresses).to.have.been.called; + }); + + it('calls into parity_allAccountsInfo', () => { + expect(api.parity.allAccountsInfo).to.have.been.called; + }); + + it('sets the accounts', () => { + expect(store.setAccounts).to.have.been.called; + }); + }); + + describe('loadDefaultAccount', () => { + beforeEach(() => { + return store.loadDefaultAccount(); + }); + + it('load and set the default account', () => { + expect(store.defaultAccount).to.equal(ACCOUNT_DEFAULT); + }); + }); + + describe('makeDefaultAccount', () => { + beforeEach(() => { + return store.makeDefaultAccount(ACCOUNT_NEW); + }); + + it('calls into parity_setNewDappsDefaultAddress', () => { + expect(api.parity.setNewDappsDefaultAddress).to.have.been.calledWith(ACCOUNT_NEW); + }); + }); + }); +}); diff --git a/js/src/views/ParityBar/index.js b/js-old/src/views/ParityBar/index.js similarity index 100% rename from js/src/views/ParityBar/index.js rename to js-old/src/views/ParityBar/index.js diff --git a/js/src/views/ParityBar/parityBar.css b/js-old/src/views/ParityBar/parityBar.css similarity index 100% rename from js/src/views/ParityBar/parityBar.css rename to js-old/src/views/ParityBar/parityBar.css diff --git a/js/src/views/ParityBar/parityBar.js b/js-old/src/views/ParityBar/parityBar.js similarity index 100% rename from js/src/views/ParityBar/parityBar.js rename to js-old/src/views/ParityBar/parityBar.js diff --git a/js/src/views/ParityBar/parityBar.spec.js b/js-old/src/views/ParityBar/parityBar.spec.js similarity index 100% rename from js/src/views/ParityBar/parityBar.spec.js rename to js-old/src/views/ParityBar/parityBar.spec.js diff --git a/js/src/views/ParityBar/parityBar.test.js b/js-old/src/views/ParityBar/parityBar.test.js similarity index 100% rename from js/src/views/ParityBar/parityBar.test.js rename to js-old/src/views/ParityBar/parityBar.test.js diff --git a/js/src/views/RpcCalls/actions/localstorage.js b/js-old/src/views/RpcCalls/actions/localstorage.js similarity index 100% rename from js/src/views/RpcCalls/actions/localstorage.js rename to js-old/src/views/RpcCalls/actions/localstorage.js diff --git a/js/src/views/RpcCalls/actions/logger.js b/js-old/src/views/RpcCalls/actions/logger.js similarity index 100% rename from js/src/views/RpcCalls/actions/logger.js rename to js-old/src/views/RpcCalls/actions/logger.js diff --git a/js/src/views/RpcCalls/actions/rpc.js b/js-old/src/views/RpcCalls/actions/rpc.js similarity index 100% rename from js/src/views/RpcCalls/actions/rpc.js rename to js-old/src/views/RpcCalls/actions/rpc.js diff --git a/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.js b/js-old/src/views/RpcCalls/components/AutoComplete/AutoComplete.js similarity index 100% rename from js/src/views/RpcCalls/components/AutoComplete/AutoComplete.js rename to js-old/src/views/RpcCalls/components/AutoComplete/AutoComplete.js diff --git a/js/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js b/js-old/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js similarity index 100% rename from js/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js rename to js-old/src/views/RpcCalls/components/AutoComplete/AutoComplete.spec.js diff --git a/js/src/views/RpcCalls/components/AutoComplete/index.js b/js-old/src/views/RpcCalls/components/AutoComplete/index.js similarity index 100% rename from js/src/views/RpcCalls/components/AutoComplete/index.js rename to js-old/src/views/RpcCalls/components/AutoComplete/index.js diff --git a/js/src/views/RpcCalls/components/Box/Box.js b/js-old/src/views/RpcCalls/components/Box/Box.js similarity index 100% rename from js/src/views/RpcCalls/components/Box/Box.js rename to js-old/src/views/RpcCalls/components/Box/Box.js diff --git a/js/src/views/RpcCalls/components/Box/Box.spec.js b/js-old/src/views/RpcCalls/components/Box/Box.spec.js similarity index 100% rename from js/src/views/RpcCalls/components/Box/Box.spec.js rename to js-old/src/views/RpcCalls/components/Box/Box.spec.js diff --git a/js/src/views/RpcCalls/components/Box/index.js b/js-old/src/views/RpcCalls/components/Box/index.js similarity index 100% rename from js/src/views/RpcCalls/components/Box/index.js rename to js-old/src/views/RpcCalls/components/Box/index.js diff --git a/js/src/views/RpcCalls/components/Call/Call.css b/js-old/src/views/RpcCalls/components/Call/Call.css similarity index 100% rename from js/src/views/RpcCalls/components/Call/Call.css rename to js-old/src/views/RpcCalls/components/Call/Call.css diff --git a/js/src/views/RpcCalls/components/Call/Call.js b/js-old/src/views/RpcCalls/components/Call/Call.js similarity index 100% rename from js/src/views/RpcCalls/components/Call/Call.js rename to js-old/src/views/RpcCalls/components/Call/Call.js diff --git a/js/src/views/RpcCalls/components/Call/Call.spec.js b/js-old/src/views/RpcCalls/components/Call/Call.spec.js similarity index 100% rename from js/src/views/RpcCalls/components/Call/Call.spec.js rename to js-old/src/views/RpcCalls/components/Call/Call.spec.js diff --git a/js/src/views/RpcCalls/components/Call/index.js b/js-old/src/views/RpcCalls/components/Call/index.js similarity index 100% rename from js/src/views/RpcCalls/components/Call/index.js rename to js-old/src/views/RpcCalls/components/Call/index.js diff --git a/js/src/views/RpcCalls/components/Calls/Calls.css b/js-old/src/views/RpcCalls/components/Calls/Calls.css similarity index 100% rename from js/src/views/RpcCalls/components/Calls/Calls.css rename to js-old/src/views/RpcCalls/components/Calls/Calls.css diff --git a/js/src/views/RpcCalls/components/Calls/Calls.js b/js-old/src/views/RpcCalls/components/Calls/Calls.js similarity index 100% rename from js/src/views/RpcCalls/components/Calls/Calls.js rename to js-old/src/views/RpcCalls/components/Calls/Calls.js diff --git a/js/src/views/RpcCalls/components/Calls/Calls.spec.js b/js-old/src/views/RpcCalls/components/Calls/Calls.spec.js similarity index 100% rename from js/src/views/RpcCalls/components/Calls/Calls.spec.js rename to js-old/src/views/RpcCalls/components/Calls/Calls.spec.js diff --git a/js/src/views/RpcCalls/components/Calls/index.js b/js-old/src/views/RpcCalls/components/Calls/index.js similarity index 100% rename from js/src/views/RpcCalls/components/Calls/index.js rename to js-old/src/views/RpcCalls/components/Calls/index.js diff --git a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css b/js-old/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css similarity index 100% rename from js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css rename to js-old/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.css diff --git a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js b/js-old/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js similarity index 100% rename from js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js rename to js-old/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.js diff --git a/js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js b/js-old/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js similarity index 100% rename from js/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js rename to js-old/src/views/RpcCalls/components/CallsToolbar/CallsToolbar.spec.js diff --git a/js/src/views/RpcCalls/components/CallsToolbar/index.js b/js-old/src/views/RpcCalls/components/CallsToolbar/index.js similarity index 100% rename from js/src/views/RpcCalls/components/CallsToolbar/index.js rename to js-old/src/views/RpcCalls/components/CallsToolbar/index.js diff --git a/js/src/views/RpcCalls/components/EditableValue/EditableValue.css b/js-old/src/views/RpcCalls/components/EditableValue/EditableValue.css similarity index 100% rename from js/src/views/RpcCalls/components/EditableValue/EditableValue.css rename to js-old/src/views/RpcCalls/components/EditableValue/EditableValue.css diff --git a/js/src/views/RpcCalls/components/EditableValue/EditableValue.js b/js-old/src/views/RpcCalls/components/EditableValue/EditableValue.js similarity index 100% rename from js/src/views/RpcCalls/components/EditableValue/EditableValue.js rename to js-old/src/views/RpcCalls/components/EditableValue/EditableValue.js diff --git a/js/src/views/RpcCalls/components/EditableValue/index.js b/js-old/src/views/RpcCalls/components/EditableValue/index.js similarity index 100% rename from js/src/views/RpcCalls/components/EditableValue/index.js rename to js-old/src/views/RpcCalls/components/EditableValue/index.js diff --git a/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.css b/js-old/src/views/RpcCalls/components/JsonEditor/JsonEditor.css similarity index 100% rename from js/src/views/RpcCalls/components/JsonEditor/JsonEditor.css rename to js-old/src/views/RpcCalls/components/JsonEditor/JsonEditor.css diff --git a/js/src/views/RpcCalls/components/JsonEditor/JsonEditor.js b/js-old/src/views/RpcCalls/components/JsonEditor/JsonEditor.js similarity index 100% rename from js/src/views/RpcCalls/components/JsonEditor/JsonEditor.js rename to js-old/src/views/RpcCalls/components/JsonEditor/JsonEditor.js diff --git a/js/src/views/RpcCalls/components/JsonEditor/index.js b/js-old/src/views/RpcCalls/components/JsonEditor/index.js similarity index 100% rename from js/src/views/RpcCalls/components/JsonEditor/index.js rename to js-old/src/views/RpcCalls/components/JsonEditor/index.js diff --git a/js/src/views/RpcCalls/components/Markdown/Markdown.css b/js-old/src/views/RpcCalls/components/Markdown/Markdown.css similarity index 100% rename from js/src/views/RpcCalls/components/Markdown/Markdown.css rename to js-old/src/views/RpcCalls/components/Markdown/Markdown.css diff --git a/js/src/views/RpcCalls/components/Markdown/Markdown.js b/js-old/src/views/RpcCalls/components/Markdown/Markdown.js similarity index 100% rename from js/src/views/RpcCalls/components/Markdown/Markdown.js rename to js-old/src/views/RpcCalls/components/Markdown/Markdown.js diff --git a/js/src/views/RpcCalls/components/Markdown/index.js b/js-old/src/views/RpcCalls/components/Markdown/index.js similarity index 100% rename from js/src/views/RpcCalls/components/Markdown/index.js rename to js-old/src/views/RpcCalls/components/Markdown/index.js diff --git a/js/src/views/RpcCalls/components/Response/Response.css b/js-old/src/views/RpcCalls/components/Response/Response.css similarity index 100% rename from js/src/views/RpcCalls/components/Response/Response.css rename to js-old/src/views/RpcCalls/components/Response/Response.css diff --git a/js/src/views/RpcCalls/components/Response/Response.js b/js-old/src/views/RpcCalls/components/Response/Response.js similarity index 100% rename from js/src/views/RpcCalls/components/Response/Response.js rename to js-old/src/views/RpcCalls/components/Response/Response.js diff --git a/js/src/views/RpcCalls/components/Response/Response.spec.js b/js-old/src/views/RpcCalls/components/Response/Response.spec.js similarity index 100% rename from js/src/views/RpcCalls/components/Response/Response.spec.js rename to js-old/src/views/RpcCalls/components/Response/Response.spec.js diff --git a/js/src/views/RpcCalls/components/Response/index.js b/js-old/src/views/RpcCalls/components/Response/index.js similarity index 100% rename from js/src/views/RpcCalls/components/Response/index.js rename to js-old/src/views/RpcCalls/components/Response/index.js diff --git a/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.css b/js-old/src/views/RpcCalls/components/RpcCalls/RpcCalls.css similarity index 100% rename from js/src/views/RpcCalls/components/RpcCalls/RpcCalls.css rename to js-old/src/views/RpcCalls/components/RpcCalls/RpcCalls.css diff --git a/js/src/views/RpcCalls/components/RpcCalls/RpcCalls.js b/js-old/src/views/RpcCalls/components/RpcCalls/RpcCalls.js similarity index 100% rename from js/src/views/RpcCalls/components/RpcCalls/RpcCalls.js rename to js-old/src/views/RpcCalls/components/RpcCalls/RpcCalls.js diff --git a/js/src/views/RpcCalls/components/RpcCalls/index.js b/js-old/src/views/RpcCalls/components/RpcCalls/index.js similarity index 100% rename from js/src/views/RpcCalls/components/RpcCalls/index.js rename to js-old/src/views/RpcCalls/components/RpcCalls/index.js diff --git a/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.css b/js-old/src/views/RpcCalls/components/RpcDocs/RpcDocs.css similarity index 100% rename from js/src/views/RpcCalls/components/RpcDocs/RpcDocs.css rename to js-old/src/views/RpcCalls/components/RpcDocs/RpcDocs.css diff --git a/js/src/views/RpcCalls/components/RpcDocs/RpcDocs.js b/js-old/src/views/RpcCalls/components/RpcDocs/RpcDocs.js similarity index 100% rename from js/src/views/RpcCalls/components/RpcDocs/RpcDocs.js rename to js-old/src/views/RpcCalls/components/RpcDocs/RpcDocs.js diff --git a/js/src/views/RpcCalls/components/RpcDocs/index.js b/js-old/src/views/RpcCalls/components/RpcDocs/index.js similarity index 100% rename from js/src/views/RpcCalls/components/RpcDocs/index.js rename to js-old/src/views/RpcCalls/components/RpcDocs/index.js diff --git a/js/src/views/RpcCalls/components/RpcNav/RpcNav.css b/js-old/src/views/RpcCalls/components/RpcNav/RpcNav.css similarity index 100% rename from js/src/views/RpcCalls/components/RpcNav/RpcNav.css rename to js-old/src/views/RpcCalls/components/RpcNav/RpcNav.css diff --git a/js/src/views/RpcCalls/components/RpcNav/RpcNav.js b/js-old/src/views/RpcCalls/components/RpcNav/RpcNav.js similarity index 100% rename from js/src/views/RpcCalls/components/RpcNav/RpcNav.js rename to js-old/src/views/RpcCalls/components/RpcNav/RpcNav.js diff --git a/js/src/views/RpcCalls/components/RpcNav/index.js b/js-old/src/views/RpcCalls/components/RpcNav/index.js similarity index 100% rename from js/src/views/RpcCalls/components/RpcNav/index.js rename to js-old/src/views/RpcCalls/components/RpcNav/index.js diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css b/js-old/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css similarity index 100% rename from js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css rename to js-old/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.css diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js b/js-old/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js similarity index 100% rename from js/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js rename to js-old/src/views/RpcCalls/components/ScrollTopButton/ScrollTopButton.js diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/index.js b/js-old/src/views/RpcCalls/components/ScrollTopButton/index.js similarity index 100% rename from js/src/views/RpcCalls/components/ScrollTopButton/index.js rename to js-old/src/views/RpcCalls/components/ScrollTopButton/index.js diff --git a/js/src/views/RpcCalls/components/ScrollTopButton/util.js b/js-old/src/views/RpcCalls/components/ScrollTopButton/util.js similarity index 100% rename from js/src/views/RpcCalls/components/ScrollTopButton/util.js rename to js-old/src/views/RpcCalls/components/ScrollTopButton/util.js diff --git a/js/src/views/RpcCalls/constants/index.js b/js-old/src/views/RpcCalls/constants/index.js similarity index 100% rename from js/src/views/RpcCalls/constants/index.js rename to js-old/src/views/RpcCalls/constants/index.js diff --git a/js/src/views/RpcCalls/containers/RpcPage/RpcPage.js b/js-old/src/views/RpcCalls/containers/RpcPage/RpcPage.js similarity index 100% rename from js/src/views/RpcCalls/containers/RpcPage/RpcPage.js rename to js-old/src/views/RpcCalls/containers/RpcPage/RpcPage.js diff --git a/js/src/views/RpcCalls/containers/RpcPage/index.js b/js-old/src/views/RpcCalls/containers/RpcPage/index.js similarity index 100% rename from js/src/views/RpcCalls/containers/RpcPage/index.js rename to js-old/src/views/RpcCalls/containers/RpcPage/index.js diff --git a/js/src/views/RpcCalls/data/rpc.json b/js-old/src/views/RpcCalls/data/rpc.json similarity index 100% rename from js/src/views/RpcCalls/data/rpc.json rename to js-old/src/views/RpcCalls/data/rpc.json diff --git a/js/src/views/RpcCalls/middleware/index.js b/js-old/src/views/RpcCalls/middleware/index.js similarity index 100% rename from js/src/views/RpcCalls/middleware/index.js rename to js-old/src/views/RpcCalls/middleware/index.js diff --git a/js/src/views/RpcCalls/middleware/localstorage.js b/js-old/src/views/RpcCalls/middleware/localstorage.js similarity index 100% rename from js/src/views/RpcCalls/middleware/localstorage.js rename to js-old/src/views/RpcCalls/middleware/localstorage.js diff --git a/js/src/views/RpcCalls/middleware/localstorage.spec.js b/js-old/src/views/RpcCalls/middleware/localstorage.spec.js similarity index 100% rename from js/src/views/RpcCalls/middleware/localstorage.spec.js rename to js-old/src/views/RpcCalls/middleware/localstorage.spec.js diff --git a/js/src/views/RpcCalls/reducers/index.js b/js-old/src/views/RpcCalls/reducers/index.js similarity index 100% rename from js/src/views/RpcCalls/reducers/index.js rename to js-old/src/views/RpcCalls/reducers/index.js diff --git a/js/src/views/RpcCalls/reducers/logger.js b/js-old/src/views/RpcCalls/reducers/logger.js similarity index 100% rename from js/src/views/RpcCalls/reducers/logger.js rename to js-old/src/views/RpcCalls/reducers/logger.js diff --git a/js/src/views/RpcCalls/reducers/rpc.js b/js-old/src/views/RpcCalls/reducers/rpc.js similarity index 100% rename from js/src/views/RpcCalls/reducers/rpc.js rename to js-old/src/views/RpcCalls/reducers/rpc.js diff --git a/js/src/views/RpcCalls/util/error.js b/js-old/src/views/RpcCalls/util/error.js similarity index 100% rename from js/src/views/RpcCalls/util/error.js rename to js-old/src/views/RpcCalls/util/error.js diff --git a/js/src/views/RpcCalls/util/error.spec.js b/js-old/src/views/RpcCalls/util/error.spec.js similarity index 100% rename from js/src/views/RpcCalls/util/error.spec.js rename to js-old/src/views/RpcCalls/util/error.spec.js diff --git a/js/src/views/RpcCalls/util/index.js b/js-old/src/views/RpcCalls/util/index.js similarity index 100% rename from js/src/views/RpcCalls/util/index.js rename to js-old/src/views/RpcCalls/util/index.js diff --git a/js/src/views/RpcCalls/util/index.spec.js b/js-old/src/views/RpcCalls/util/index.spec.js similarity index 100% rename from js/src/views/RpcCalls/util/index.spec.js rename to js-old/src/views/RpcCalls/util/index.spec.js diff --git a/js/src/views/RpcCalls/util/react.js b/js-old/src/views/RpcCalls/util/react.js similarity index 100% rename from js/src/views/RpcCalls/util/react.js rename to js-old/src/views/RpcCalls/util/react.js diff --git a/js/src/views/RpcCalls/util/rpc-md.js b/js-old/src/views/RpcCalls/util/rpc-md.js similarity index 100% rename from js/src/views/RpcCalls/util/rpc-md.js rename to js-old/src/views/RpcCalls/util/rpc-md.js diff --git a/js/src/views/Settings/Background/background.css b/js-old/src/views/Settings/Background/background.css similarity index 100% rename from js/src/views/Settings/Background/background.css rename to js-old/src/views/Settings/Background/background.css diff --git a/js/src/views/Settings/Background/background.js b/js-old/src/views/Settings/Background/background.js similarity index 100% rename from js/src/views/Settings/Background/background.js rename to js-old/src/views/Settings/Background/background.js diff --git a/js/src/views/Settings/Background/index.js b/js-old/src/views/Settings/Background/index.js similarity index 100% rename from js/src/views/Settings/Background/index.js rename to js-old/src/views/Settings/Background/index.js diff --git a/js/src/views/Settings/Parity/index.js b/js-old/src/views/Settings/Parity/index.js similarity index 100% rename from js/src/views/Settings/Parity/index.js rename to js-old/src/views/Settings/Parity/index.js diff --git a/js/src/views/Settings/Parity/parity.js b/js-old/src/views/Settings/Parity/parity.js similarity index 96% rename from js/src/views/Settings/Parity/parity.js rename to js-old/src/views/Settings/Parity/parity.js index 853ba3aa193211a7c977d9d3802c50c57e72d984..7de9b8061e19f4da36464792db985791211b2c91 100644 --- a/js/src/views/Settings/Parity/parity.js +++ b/js-old/src/views/Settings/Parity/parity.js @@ -46,8 +46,6 @@ export default class Parity extends Component { } > - -
@@ -60,10 +58,10 @@ export default class Parity extends Component {
{ this.renderChains() } { this.renderModes() } +
- { this.renderLogsConfig() } ); @@ -263,14 +261,6 @@ export default class Parity extends Component { /> )) } - { - this.renderItem('musicoin', ( - - )) - } { this.renderItem('dev', ( p { diff --git a/js/src/views/Signer/components/SignRequest/signRequest.js b/js-old/src/views/Signer/components/SignRequest/signRequest.js similarity index 85% rename from js/src/views/Signer/components/SignRequest/signRequest.js rename to js-old/src/views/Signer/components/SignRequest/signRequest.js index f4f4d27d1aee8a16dca279f17a2c958121990d18..2f97f140f5f0382245988f7152449de5bf74a643 100644 --- a/js/src/views/Signer/components/SignRequest/signRequest.js +++ b/js-old/src/views/Signer/components/SignRequest/signRequest.js @@ -18,10 +18,8 @@ import { observer } from 'mobx-react'; import React, { Component, PropTypes } from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import ReactMarkdown from 'react-markdown'; import ReactTooltip from 'react-tooltip'; -import { hexToAscii } from '~/api/util/format'; import HardwareStore from '~/mobx/hardwareStore'; import Account from '../Account'; @@ -31,39 +29,16 @@ import RequestOrigin from '../RequestOrigin'; import styles from './signRequest.css'; function isAscii (data) { - for (let i = 2; i < data.length; i += 2) { + for (var i = 2; i < data.length; i += 2) { let n = parseInt(data.substr(i, 2), 16); if (n < 32 || n >= 128) { return false; } } - return true; } -function decodeMarkdown (data) { - return decodeURIComponent(escape(hexToAscii(data))); -} - -export function isMarkdown (data) { - try { - const decoded = decodeMarkdown(data); - - for (let i = 0; i < decoded.length; i++) { - const code = decoded.charCodeAt(i); - - if (code < 32 && code !== 10) { - return false; - } - } - - return decoded.indexOf('#') !== -1 || decoded.indexOf('*') !== -1; - } catch (error) { - return false; - } -} - @observer class SignRequest extends Component { static contextTypes = { @@ -138,26 +113,29 @@ class SignRequest extends Component { ); } - renderData (data) { - if (isAscii(data)) { - return hexToAscii(data); - } - - if (isMarkdown(data)) { - return ( - - ); - } + renderAsciiDetails (ascii) { + return ( +
+

{ascii}

+
+ ); + } + renderBinaryDetails (data) { return ( - +
+

+ +

+
); } renderDetails () { + const { api } = this.context; const { address, data, netVersion, origin, signerStore } = this.props; const { hashToSign } = this.state; const { balances, externalLink } = signerStore; @@ -171,14 +149,12 @@ class SignRequest extends Component { const tooltip = [ , -
, +
, @@ -212,9 +188,11 @@ class SignRequest extends Component { defaultMessage='A request to sign data using your account:' />

-
-

{ this.renderData(data) }

-
+ { + isAscii(data) + ? this.renderAsciiDetails(api.util.hexToAscii(data)) + : this.renderBinaryDetails(data) + }

x, - hexToBytes: (x) => x, - asciiToHex: (x) => x - } - } - }; component = shallow( , - { context } - ).find('SignRequest').shallow({ context }); + { + context: { + store: reduxStore, + api: { + util: { + sha3: (x) => x, + hexToBytes: (x) => x, + asciiToHex: (x) => x + } + } + } + } + ).find('SignRequest').shallow(); return component; } -describe('views/Signer/components/SignRequest', () => { +describe.only('views/Signer/components/SignRequest', () => { beforeEach(() => { render(); }); @@ -83,24 +76,4 @@ describe('views/Signer/components/SignRequest', () => { it('renders', () => { expect(component).to.be.ok; }); - - describe('isMarkdown', () => { - it('returns true for markdown', () => { - const testMd = '# this is some\n\n*markdown*'; - const encodedMd = asciiToHex(unescape(encodeURIComponent(testMd))); - - expect(isMarkdown(encodedMd)).to.be.true; - }); - - it('return true with utf-8 markdown', () => { - const testMd = '# header\n\n(n) you are not a citizen of, or resident in, or located in, or incorporated or otherwise established in, the People\'s Republic of China 参与方并非中华人民共和国公民，或不常住中华人民共和国，或不位于中华人民共和国境内，或并非在中华人民共和国设立或以其他方式组建; and'; - const encodedMd = asciiToHex(unescape(encodeURIComponent(testMd))); - - expect(isMarkdown(encodedMd)).to.be.true; - }); - - it('returns false for random data', () => { - expect(isMarkdown('0x1234')).to.be.false; - }); - }); }); diff --git a/js/src/views/Signer/components/TransactionMainDetails/index.js b/js-old/src/views/Signer/components/TransactionMainDetails/index.js similarity index 100% rename from js/src/views/Signer/components/TransactionMainDetails/index.js rename to js-old/src/views/Signer/components/TransactionMainDetails/index.js diff --git a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css b/js-old/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css similarity index 100% rename from js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css rename to js-old/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.css diff --git a/js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js b/js-old/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js similarity index 100% rename from js/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js rename to js-old/src/views/Signer/components/TransactionMainDetails/transactionMainDetails.js diff --git a/js/src/views/Signer/components/TransactionPending/index.js b/js-old/src/views/Signer/components/TransactionPending/index.js similarity index 100% rename from js/src/views/Signer/components/TransactionPending/index.js rename to js-old/src/views/Signer/components/TransactionPending/index.js diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.css b/js-old/src/views/Signer/components/TransactionPending/transactionPending.css similarity index 100% rename from js/src/views/Signer/components/TransactionPending/transactionPending.css rename to js-old/src/views/Signer/components/TransactionPending/transactionPending.css diff --git a/js/src/views/Signer/components/TransactionPending/transactionPending.js b/js-old/src/views/Signer/components/TransactionPending/transactionPending.js similarity index 95% rename from js/src/views/Signer/components/TransactionPending/transactionPending.js rename to js-old/src/views/Signer/components/TransactionPending/transactionPending.js index 2d6797b69e58bcbf17eec998beaa45723284341d..b9cc8f684ba627d4ea24dc9b722124c75ccd5824 100644 --- a/js/src/views/Signer/components/TransactionPending/transactionPending.js +++ b/js-old/src/views/Signer/components/TransactionPending/transactionPending.js @@ -36,7 +36,6 @@ class TransactionPending extends Component { }; static propTypes = { - availability: PropTypes.string.isRequired, accounts: PropTypes.object.isRequired, className: PropTypes.string, date: PropTypes.instanceOf(Date).isRequired, @@ -141,11 +140,11 @@ class TransactionPending extends Component { } renderTxEditor () { - const { availability, className } = this.props; + const { className } = this.props; return (

- +