From 08b0a02183397904c4c7f278321d8ec61b4a6a95 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Fri, 21 Dec 2018 16:31:25 +0100 Subject: [PATCH] Bump deps (#33) * Bump deps * Bump deps, enable Alexander (testing) --- packages/ui-identicon/package.json | 4 +-- packages/ui-keyring/package.json | 4 +-- packages/ui-settings/src/defaults.ts | 8 +++++- packages/ui-settings/src/index.ts | 4 +-- yarn.lock | 42 ++++++++++++++-------------- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/packages/ui-identicon/package.json b/packages/ui-identicon/package.json index f826d7d7..59ca23dc 100644 --- a/packages/ui-identicon/package.json +++ b/packages/ui-identicon/package.json @@ -10,9 +10,9 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.2.0", - "@polkadot/keyring": "^0.33.24", + "@polkadot/keyring": "^0.33.26", "@polkadot/ui-settings": "^0.24.7", - "@polkadot/util-crypto": "^0.33.24", + "@polkadot/util-crypto": "^0.33.26", "@types/color": "^3.0.0", "@types/react-copy-to-clipboard": "^4.2.6", "color": "^3.0.0", diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index cb0b5b3d..57e6bc02 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -11,8 +11,8 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.2.0", - "@polkadot/keyring": "^0.33.24", - "@polkadot/types": "^0.35.6", + "@polkadot/keyring": "^0.33.26", + "@polkadot/types": "^0.35.9", "@types/store": "^2.0.1", "store": "^2.0.12" } diff --git a/packages/ui-settings/src/defaults.ts b/packages/ui-settings/src/defaults.ts index 4011823e..505e99b0 100644 --- a/packages/ui-settings/src/defaults.ts +++ b/packages/ui-settings/src/defaults.ts @@ -22,12 +22,18 @@ const CHAINS: ChainsInfo = [ networkId: 68, tokenDecimals: 15, tokenSymbol: 'CHR' + }, + { + name: 'Alexander', + networkId: 3, + tokenDecimals: 15, + tokenSymbol: 'DOT' } ]; const ENDPOINTS: Options = [ + { text: 'Alexander (Polkadot, hosted by Parity)', value: 'wss://poc3-rpc.polkadot.io/' }, { text: 'Charred Cherry (Substrate, hosted by Parity)', value: 'wss://substrate-rpc.parity.io/' }, - { disabled: true, text: 'Alexander (Polkadot, hosted by Parity)', value: 'wss://polkadot-rpc.polkadot.io/' }, { text: 'Local Node (127.0.0.1:9944)', value: 'ws://127.0.0.1:9944/' } ]; diff --git a/packages/ui-settings/src/index.ts b/packages/ui-settings/src/index.ts index eaa73b26..b5d94a1b 100644 --- a/packages/ui-settings/src/index.ts +++ b/packages/ui-settings/src/index.ts @@ -16,9 +16,7 @@ class Settings implements SettingsStruct { constructor () { const settings = store.get('settings') || {}; - // FIXME Here we have the defaults for Charred Cherry, swap to Polkadot as soon as poc-3 is there - // FIXME WS_URL first, then substrate-rpc - this._apiUrl = settings.apiUrl || ENDPOINTS[0].value || process.env.WS_URL; + this._apiUrl = settings.apiUrl || process.env.WS_URL || ENDPOINTS[0].value; this._i18nLang = settings.i18nLang || LANGUAGES[0].value; this._uiMode = settings.uiMode || process.env.UI_MODE || UIMODES[0].value; this._uiTheme = settings.uiTheme || process.env.UI_THEME || UITHEMES[0].value; diff --git a/yarn.lock b/yarn.lock index e18df59b..bb0a36d7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,14 +1486,14 @@ typedoc-plugin-no-inherit "^1.0.2" typescript "^3.2.2" -"@polkadot/keyring@^0.33.24": - version "0.33.24" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.33.24.tgz#7c68dc06dd53b70f7c3e6bf3ec0acce4486da206" - integrity sha512-D1Dtrp4f/S8IRa9ZaSjbnWQ4PjJWK+bs8AOfgqoaHLlrFvXf31ipE8MYgODB0EMFDNCf8RLqr8ftG3vVsRF+vw== +"@polkadot/keyring@^0.33.26": + version "0.33.26" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.33.26.tgz#b9140a2296a4ba759ce66c0f706499c9aeaaa6e4" + integrity sha512-0Fmdqu+h/vzjstpVlHL76Fn7/AUVXQuPRCSO+QV4oejGPHacsmM/pUMN60P/+TptzcR/g5jFUu8tlPYFf/feaw== dependencies: "@babel/runtime" "^7.2.0" - "@polkadot/util" "^0.33.24" - "@polkadot/util-crypto" "^0.33.24" + "@polkadot/util" "^0.33.26" + "@polkadot/util-crypto" "^0.33.26" "@types/bs58" "^3.0.30" bs58 "^4.0.1" @@ -1502,23 +1502,23 @@ resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.44.tgz#2fb28215f10b869bfa544fd8df8fccb4932d64f2" integrity sha512-tor7vSd3ZsRBO9FIuKZQ9hfqEGkNZnanAFVGmoL1iSmdhcoKtYTlQe0BQafjIynqIMOfXdJ7Zes9PlorPtw6yw== -"@polkadot/types@^0.35.6": - version "0.35.6" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.35.6.tgz#a73e6b458f9d6b33c2786d3d92953e2711983412" - integrity sha512-JcZTto3LSCwBWbtDaYfLw0fwEmKIRRuz/Q6lpDK/LmD6O6q/ZJsL6osYLCyrrudA69HPW05KvUD62n+y+OzvXg== +"@polkadot/types@^0.35.9": + version "0.35.9" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.35.9.tgz#26091a0b3faa547bfa5dbc9dfe0383689ea4dfd2" + integrity sha512-o1VqgRth2lAlbFlbkzBjNhGAgIwbKAsKcDlRNqVUZJwkyQIcrBhNbs0w3DfwtTVWw/OeYpeEc9Jlf7yXQaZhIQ== dependencies: "@babel/runtime" "^7.2.0" - "@polkadot/keyring" "^0.33.24" - "@polkadot/util" "^0.33.24" + "@polkadot/keyring" "^0.33.26" + "@polkadot/util" "^0.33.26" core-js "^2.6.1" -"@polkadot/util-crypto@^0.33.24": - version "0.33.24" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.33.24.tgz#9b29f4aaeb2c475b38c3007816c9f0ffb74892ca" - integrity sha512-obs13hyBtO9TZ3MkleMvlWinDZUSj+59DkVndbfD8HX9hEzcs6LBWGwzKYh3Ad8wsbfpeebY/cugvtGXswzF3g== +"@polkadot/util-crypto@^0.33.26": + version "0.33.26" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.33.26.tgz#ea8edbdb4d8acf5fa5c09c94ec0a008e7d9c37c2" + integrity sha512-kGtDoRX/xSDG8lQjnrX5qgJOKzlcUoxcSbT/pT+cAtueadMQuDkpUJCD7OeXi6hyTbDc3kkkriFQko+kVBs6+g== dependencies: "@babel/runtime" "^7.2.0" - "@polkadot/util" "^0.33.24" + "@polkadot/util" "^0.33.26" "@types/bip39" "^2.4.1" bip39 "^2.5.0" blakejs "^1.1.0" @@ -1526,10 +1526,10 @@ tweetnacl "^1.0.0" xxhashjs "^0.2.2" -"@polkadot/util@^0.33.24": - version "0.33.24" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.33.24.tgz#c8d3a765b65e99dca3bc0f8d44f5b0e21a926e92" - integrity sha512-AKBmNjwdidJ95DG2alSibO4tDFBuLjYCpPSLWmb5CfU6UFO70vpsskaoBpJPSrvJaT+EgvgcDpDewSUCb4GLbQ== +"@polkadot/util@^0.33.26": + version "0.33.26" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.33.26.tgz#186ac1f398da8608e693f27cc528df9cbeb8412c" + integrity sha512-ZpbjiUp950RNRDkIXGtnWNWQCbZlMoBQQChByDDuhG6LeVxewszeP1jO+uK4RCrMbwz8aDUI9J/z1ApoLvbAzw== dependencies: "@babel/runtime" "^7.2.0" "@types/bn.js" "^4.11.3"