diff --git a/packages/react-identicon/package.json b/packages/react-identicon/package.json index a74f877c..f8f315dd 100644 --- a/packages/react-identicon/package.json +++ b/packages/react-identicon/package.json @@ -24,8 +24,8 @@ "react": "*" }, "devDependencies": { - "@polkadot/keyring": "^2.0.0-beta.6", - "@polkadot/util-crypto": "^2.0.0-beta.6", + "@polkadot/keyring": "^2.0.0-beta.7", + "@polkadot/util-crypto": "^2.0.0-beta.7", "xmlserializer": "^0.6.1" } } diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index 3dc44534..8dd54807 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -30,9 +30,9 @@ "store": "^2.0.12" }, "devDependencies": { - "@polkadot/keyring": "^2.0.0-beta.6", - "@polkadot/types": "^1.0.0-beta.19", - "@polkadot/util": "^2.0.0-beta.6" + "@polkadot/keyring": "^2.0.0-beta.7", + "@polkadot/types": "^1.0.0-beta.30", + "@polkadot/util": "^2.0.0-beta.7" }, "optionalDependencies": { "@ledgerhq/hw-transport-node-hid": "^5.7.0" diff --git a/packages/ui-keyring/src/index.ts b/packages/ui-keyring/src/index.ts index baf2d7fe..ccd31bf3 100644 --- a/packages/ui-keyring/src/index.ts +++ b/packages/ui-keyring/src/index.ts @@ -2,12 +2,20 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { assertSingletonPackage } from '@polkadot/util'; +import { detectPackage } from '@polkadot/util'; import keyring, { Keyring } from './Keyring'; import Ledger from './ledger'; -assertSingletonPackage('@polkadot/ui-keyring'); +let pkgJson; + +try { + pkgJson = require('./package.json'); +} catch (error) { + pkgJson = require('../package.json'); +} + +detectPackage(pkgJson); export default keyring; diff --git a/packages/ui-settings/package.json b/packages/ui-settings/package.json index 9e9a67ff..0c6decb0 100644 --- a/packages/ui-settings/package.json +++ b/packages/ui-settings/package.json @@ -14,7 +14,7 @@ "store": "^2.0.12" }, "devDependencies": { - "@polkadot/util": "^2.0.0-beta.6" + "@polkadot/util": "^2.0.0-beta.7" }, "peerDependencies": { "@polkadot/util": "*" diff --git a/packages/ui-shared/package.json b/packages/ui-shared/package.json index b0947f73..d00fb6aa 100644 --- a/packages/ui-shared/package.json +++ b/packages/ui-shared/package.json @@ -17,6 +17,6 @@ "@polkadot/util-crypto": "*" }, "devDependencies": { - "@polkadot/util-crypto": "^2.0.0-beta.6" + "@polkadot/util-crypto": "^2.0.0-beta.7" } } diff --git a/yarn.lock b/yarn.lock index bb4ad1f8..50204e21 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2352,24 +2352,24 @@ typescript "^3.7.5" vuepress "^1.2.0" -"@polkadot/keyring@^2.0.0-beta.6": - version "2.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.0.0-beta.6.tgz#fdc7d45039a3e8c428ebcc38b620b7a42cdd6a42" - integrity sha512-pMV6gIk99lwQ7tHpiZPmcw3/LPqAF8a09jb5ddBu0a/RG3pnKy+0k23C2ckAqEtfHj6z2lCpXYOSBXwepMzDwQ== +"@polkadot/keyring@^2.0.0-beta.7": + version "2.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-2.0.0-beta.7.tgz#6c836ac14c9201df663709d4babeaf9b68279bf4" + integrity sha512-xOgXuRSg5+rYlcLe5HXellcQJ6SEFYVev7AKRjK0loMNAowX/KRt08eN6vzpVwLOnX9dt53b4mT0b1uQNxHsSA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/util" "^2.0.0-beta.6" - "@polkadot/util-crypto" "^2.0.0-beta.6" + "@polkadot/util" "^2.0.0-beta.7" + "@polkadot/util-crypto" "^2.0.0-beta.7" -"@polkadot/metadata@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.19.tgz#27b83a511f06d415c00aba79e2de63ebac48ba8a" - integrity sha512-8kpKTju7xJ8VUV32SsyIiP/FOB/7bHbcuMJA3lyGGuM6zkaSNoRfnFM2jz2SJoZPJiRD4G16QREfDaG67v02Rw== +"@polkadot/metadata@^1.0.0-beta.30": + version "1.0.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.30.tgz#f83d710d30cf83d6809bd674a83817e46b1dc0f2" + integrity sha512-gLDyEhkFM+mJvIAR/PeUwwNNX1f296bik2MHCYOAjq7u80apsQ0whgzUknhF4t7uW6RY4TO/6ercUWsyCu+oTg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.19" - "@polkadot/util" "^2.0.0-beta.6" - "@polkadot/util-crypto" "^2.0.0-beta.6" + "@polkadot/types" "^1.0.0-beta.30" + "@polkadot/util" "^2.0.0-beta.7" + "@polkadot/util-crypto" "^2.0.0-beta.7" "@polkadot/ts@^0.1.91": version "0.1.91" @@ -2378,25 +2378,25 @@ dependencies: "@types/chrome" "^0.0.92" -"@polkadot/types@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.19.tgz#9e96c399320a89b8d6e97b5981b8927d8d38788e" - integrity sha512-+NZDSjgxrVR532KiOo/eZSlMukyEyKBsXdDcYvfurEFa6JXqYOdNc6KlYn6kXToJNCVileQINnEvfwjF0OPAWQ== +"@polkadot/types@^1.0.0-beta.30": + version "1.0.0-beta.30" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.30.tgz#d14ec5f396dc1513d39fbc8114114f00ce8aa5c1" + integrity sha512-BkpWw6vob5/3kPfZRVkL8z8jHSjUiOlaF1Aeb7bJylcRkMZRTsIlOMchpHqzA5k63myTsJCt7tOPrqbBfObAjA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.19" - "@polkadot/util" "^2.0.0-beta.6" - "@polkadot/util-crypto" "^2.0.0-beta.6" + "@polkadot/metadata" "^1.0.0-beta.30" + "@polkadot/util" "^2.0.0-beta.7" + "@polkadot/util-crypto" "^2.0.0-beta.7" "@types/memoizee" "^0.4.3" memoizee "^0.4.14" -"@polkadot/util-crypto@^2.0.0-beta.6": - version "2.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.0.0-beta.6.tgz#948fd431e12f792d017bf8b550346cdd1b165b35" - integrity sha512-/0Ro95LxgasIM3b/Avg4ZcywjZJKL1jU1hJEtSgVQDZsaRTz7IGjR0gg5DJUiGvnIbGX0QbmX3yPuN/Kjwf4Bw== +"@polkadot/util-crypto@^2.0.0-beta.7": + version "2.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-2.0.0-beta.7.tgz#7eb00da7497b11147c8f240923bdb944135d697f" + integrity sha512-xC3sWMUskI+62VDTxmzMuv+I79tUc7YxTpSsyYDOenlLC5qeN4UeXO9PvfK/mXgg+/1JGX8QnskbgbHSPtsetQ== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/util" "^2.0.0-beta.6" + "@polkadot/util" "^2.0.0-beta.7" "@polkadot/wasm-crypto" "^0.20.0-beta.2" "@types/bip39" "^2.4.2" "@types/bs58" "^4.0.0" @@ -2412,10 +2412,10 @@ tweetnacl "^1.0.2" xxhashjs "^0.2.2" -"@polkadot/util@^2.0.0-beta.6": - version "2.0.0-beta.6" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.0.0-beta.6.tgz#080daff44b19208bbc0593e0406c68ae6c451996" - integrity sha512-1ncVpdN8BogyN6GCIRRWv8OMV3WkaZSNF0AOYnwhbX8tRrNASRTLezv1Eii9I1Pn8flvqN/7ugOGKVt0cbsROg== +"@polkadot/util@^2.0.0-beta.7": + version "2.0.0-beta.7" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-2.0.0-beta.7.tgz#7d3354f5876c9c940072c8c793333f96041818e6" + integrity sha512-mTQL5BCNYWSE6k0yw4Y54TRIQLfAH6SpGJH3nR9zGTK/isKQb+dHyCMnJAhrgDpZ8GuqY0Xgk5c9FjYe07OPFw== dependencies: "@babel/runtime" "^7.8.3" "@types/bn.js" "^4.11.6" @@ -5712,7 +5712,7 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6: +debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5: version "3.2.6" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b" integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ== @@ -5935,7 +5935,7 @@ detect-indent@^5.0.0: resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50= -detect-libc@^1.0.2, detect-libc@^1.0.3: +detect-libc@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups= @@ -8376,7 +8376,7 @@ humanize-url@^1.0.0: normalize-url "^1.0.0" strip-url-auth "^1.0.0" -iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13: +iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== @@ -11322,15 +11322,6 @@ nearley@^2.7.10: randexp "0.4.6" semver "^5.4.1" -needle@^2.2.1: - version "2.4.0" - resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.0.tgz#6833e74975c444642590e15a750288c5f939b57c" - integrity sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg== - dependencies: - debug "^3.2.6" - iconv-lite "^0.4.4" - sax "^1.2.4" - negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -11479,22 +11470,6 @@ node-notifier@^6.0.0: shellwords "^0.1.1" which "^1.3.1" -node-pre-gyp@*: - version "0.14.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83" - integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA== - dependencies: - detect-libc "^1.0.2" - mkdirp "^0.5.1" - needle "^2.2.1" - nopt "^4.0.1" - npm-packlist "^1.1.6" - npmlog "^4.0.2" - rc "^1.2.7" - rimraf "^2.6.1" - semver "^5.3.0" - tar "^4.4.2" - node-releases@^1.1.46: version "1.1.47" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.47.tgz#c59ef739a1fd7ecbd9f0b7cf5b7871e8a8b591e4" @@ -11616,7 +11591,7 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: semver "^5.6.0" validate-npm-package-name "^3.0.0" -npm-packlist@^1.1.6, npm-packlist@^1.4.4: +npm-packlist@^1.4.4: version "1.4.8" resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e" integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A== @@ -11648,7 +11623,7 @@ npm-run-path@^4.0.0: dependencies: path-key "^3.0.0" -npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2: +npmlog@^4.0.1, npmlog@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b" integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg== @@ -13958,7 +13933,7 @@ rimraf@2.6.3: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -14094,7 +14069,7 @@ sass-lookup@^3.0.0: dependencies: commander "^2.16.0" -sax@^1.2.1, sax@^1.2.4, sax@~1.2.4: +sax@^1.2.1, sax@~1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -15156,7 +15131,7 @@ tar-stream@^2.0.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: +tar@^4.4.10, tar@^4.4.12, tar@^4.4.8: version "4.4.13" resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525" integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==