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

Update references to UI shell & wallet (#7808)

Browse Source 
* Update references to UI shell & wallet

* Update after merge
This commit is contained in:
Jaco Greeff 2018-02-06 14:25:02 +01:00 committed by Marek Kotewicz
parent 0a7cebe316
commit 66755be8f6
2 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Cargo.lock generated
View File

@ -2208,17 +2208,17 @@ dependencies = [
name = "parity-ui" name = "parity-ui"
version = "1.9.0" version = "1.9.0"
dependencies = [ dependencies = [
"parity-ui-dev 1.9.0 (git+https://github.com/parity-js/shell.git?rev=27495ad8a73716c08588ab852694a75d9d22ba85)", "parity-ui-dev 1.9.0 (git+https://github.com/parity-js/shell.git?rev=2f07ecec53a2319f41e5b83c01073b5386243173)",
"parity-ui-old-dev 1.9.0 (git+https://github.com/parity-js/dapp-wallet.git?rev=9993240efecb415aa880250ecef2710a413cf73f)", "parity-ui-old-dev 1.9.0 (git+https://github.com/parity-js/dapp-wallet.git?rev=1a58bf4836c84e1632e27ef607b5a388abd2bf2d)",
"parity-ui-old-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-9-v1.git)", "parity-ui-old-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git?rev=4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04)",
"parity-ui-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-9-shell.git)", "parity-ui-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-shell.git?rev=3fb77b61a7f30d6658f81d687e7e415657bd20bd)",
"rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "parity-ui-dev" name = "parity-ui-dev"
version = "1.9.0" version = "1.9.0"
source = "git+https://github.com/parity-js/shell.git?rev=27495ad8a73716c08588ab852694a75d9d22ba85#27495ad8a73716c08588ab852694a75d9d22ba85" source = "git+https://github.com/parity-js/shell.git?rev=2f07ecec53a2319f41e5b83c01073b5386243173#2f07ecec53a2319f41e5b83c01073b5386243173"
dependencies = [ dependencies = [
"parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2226,7 +2226,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-old-dev" name = "parity-ui-old-dev"
version = "1.9.0" version = "1.9.0"
source = "git+https://github.com/parity-js/dapp-wallet.git?rev=9993240efecb415aa880250ecef2710a413cf73f#9993240efecb415aa880250ecef2710a413cf73f" source = "git+https://github.com/parity-js/dapp-wallet.git?rev=1a58bf4836c84e1632e27ef607b5a388abd2bf2d#1a58bf4836c84e1632e27ef607b5a388abd2bf2d"
dependencies = [ dependencies = [
"parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2234,7 +2234,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-old-precompiled" name = "parity-ui-old-precompiled"
version = "1.9.0" version = "1.9.0"
source = "git+https://github.com/js-dist-paritytech/parity-master-1-9-v1.git#fae0129b58ed89a125c5d28bca4624b82fa4c283" source = "git+https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git?rev=4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04#4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04"
dependencies = [ dependencies = [
"parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -2242,7 +2242,7 @@ dependencies = [
[[package]] [[package]]
name = "parity-ui-precompiled" name = "parity-ui-precompiled"
version = "1.9.0" version = "1.9.0"
source = "git+https://github.com/js-dist-paritytech/parity-master-1-9-shell.git#f0cbc18b6005b4ba6e04464dc9fab83a06dcd87a" source = "git+https://github.com/js-dist-paritytech/parity-master-1-10-shell.git?rev=3fb77b61a7f30d6658f81d687e7e415657bd20bd#3fb77b61a7f30d6658f81d687e7e415657bd20bd"
dependencies = [ dependencies = [
"parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
@ -3718,10 +3718,10 @@ dependencies = [
"checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37"
"checksum parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "261c025c67ba416e9fe63aa9b3236520ce3c74cfbe43590c9cdcec4ccc8180e4" "checksum parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "261c025c67ba416e9fe63aa9b3236520ce3c74cfbe43590c9cdcec4ccc8180e4"
"checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>" "checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "<none>"
"checksum parity-ui-dev 1.9.0 (git+https://github.com/parity-js/shell.git?rev=27495ad8a73716c08588ab852694a75d9d22ba85)" = "<none>" "checksum parity-ui-dev 1.9.0 (git+https://github.com/parity-js/shell.git?rev=2f07ecec53a2319f41e5b83c01073b5386243173)" = "<none>"
"checksum parity-ui-old-dev 1.9.0 (git+https://github.com/parity-js/dapp-wallet.git?rev=9993240efecb415aa880250ecef2710a413cf73f)" = "<none>" "checksum parity-ui-old-dev 1.9.0 (git+https://github.com/parity-js/dapp-wallet.git?rev=1a58bf4836c84e1632e27ef607b5a388abd2bf2d)" = "<none>"
"checksum parity-ui-old-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-9-v1.git)" = "<none>" "checksum parity-ui-old-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git?rev=4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04)" = "<none>"
"checksum parity-ui-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-9-shell.git)" = "<none>" "checksum parity-ui-precompiled 1.9.0 (git+https://github.com/js-dist-paritytech/parity-master-1-10-shell.git?rev=3fb77b61a7f30d6658f81d687e7e415657bd20bd)" = "<none>"
"checksum parity-wasm 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ba4b1d4236b76694f6ab8d8d00cdbe1e37c6dd1b5c803d26721f27e097d4d9" "checksum parity-wasm 0.23.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b1ba4b1d4236b76694f6ab8d8d00cdbe1e37c6dd1b5c803d26721f27e097d4d9"
"checksum parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0dec124478845b142f68b446cbee953d14d4b41f1bc0425024417720dce693" "checksum parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0dec124478845b142f68b446cbee953d14d4b41f1bc0425024417720dce693"
"checksum parking_lot 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3e7f7c9857874e54afeb950eebeae662b1e51a2493666d2ea4c0a5d91dcf0412" "checksum parking_lot 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3e7f7c9857874e54afeb950eebeae662b1e51a2493666d2ea4c0a5d91dcf0412"

9
dapps/ui/Cargo.toml
View File

@ -9,12 +9,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
[build-dependencies] [build-dependencies]
rustc_version = "0.2" rustc_version = "0.2"
# These are managed by the JS scripts on CI - keep it in a single line
[dependencies] [dependencies]
parity-ui-dev = { git = "https://github.com/parity-js/shell.git", rev = "27495ad8a73716c08588ab852694a75d9d22ba85", optional = true } parity-ui-dev = { git = "https://github.com/parity-js/shell.git", rev = "2f07ecec53a2319f41e5b83c01073b5386243173", optional = true }
parity-ui-old-dev = { git = "https://github.com/parity-js/dapp-wallet.git", rev = "9993240efecb415aa880250ecef2710a413cf73f", optional = true } parity-ui-old-dev = { git = "https://github.com/parity-js/dapp-wallet.git", rev = "1a58bf4836c84e1632e27ef607b5a388abd2bf2d", optional = true }
parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-9-v1.git", optional = true } parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-shell.git", rev="3fb77b61a7f30d6658f81d687e7e415657bd20bd", optional = true }
parity-ui-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-9-shell.git", optional = true } parity-ui-old-precompiled = { git = "https://github.com/js-dist-paritytech/parity-master-1-10-wallet.git", rev="4c067dfa1a17fe71ab2ca26b18c52dcbd0f4fc04", optional = true }
[features] [features]
no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"] no-precompiled-js = ["parity-ui-dev", "parity-ui-old-dev"]