From 3b21cb68ee696c4b20d0f41798e3a58e9d4e3021 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 13:33:22 +0100 Subject: [PATCH 1/8] Bump deps --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/react-api/package.json | 4 +- yarn.lock | 151 ++++++++++++---------------- 4 files changed, 69 insertions(+), 94 deletions(-) diff --git a/package.json b/package.json index 3aa441ac128c..036a05a4a0f1 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.0.0-beta.19", - "@polkadot/api-contract": "^1.0.0-beta.19", + "@polkadot/api": "^1.0.0-beta.22", + "@polkadot/api-contract": "^1.0.0-beta.22", "@polkadot/keyring": "^2.0.0-beta.6", - "@polkadot/types": "^1.0.0-beta.19", + "@polkadot/types": "^1.0.0-beta.22", "@polkadot/util": "^2.0.0-beta.6", "@polkadot/util-crypto": "^2.0.0-beta.6", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 87ea1b4f8577..f9deee80f0a9 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.8.3", - "@polkadot/api-contract": "^1.0.0-beta.19" + "@polkadot/api-contract": "^1.0.0-beta.22" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index eeafcc8913ec..b699e52b3038 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,8 +31,8 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.8.3", - "@polkadot/api": "^1.0.0-beta.19", - "@polkadot/extension-dapp": "^0.15.0-beta.2", + "@polkadot/api": "^1.0.0-beta.22", + "@polkadot/extension-dapp": "^0.20.1", "edgeware-node-types": "^1.1.0", "rxjs-compat": "^6.5.3" } diff --git a/yarn.lock b/yarn.lock index 948b9c4ffdaf..9f530247e02f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2196,35 +2196,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-1.0.0-beta.19.tgz#ba9fb25ea24555d6d54a56bf1e3475cc714af689" - integrity sha512-OUQxbUbTcCmr9NnSmDg23jFRd8w7MiaXyuqLcxhqT1eWL8vyzmBl2BNygGz2VPu69r5IKbx+LqDgXxj6zvTX/A== +"@polkadot/api-contract@^1.0.0-beta.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-1.0.0-beta.22.tgz#c40b2ecdc5bc3e736f2a9e9314609a13c806cab2" + integrity sha512-2soKAqqMPKMhQdGhpvxlhsCwxgdKmO6SjqmxIHoPxQku2EIEB39PF0VYBRqfkpVxNXbBQTwLhQLI6dbM7OHsJA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.19" + "@polkadot/types" "^1.0.0-beta.22" -"@polkadot/api-derive@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-1.0.0-beta.19.tgz#275a96eb0b0ab624e9c28879b1ee0c3f2d69c93b" - integrity sha512-FbTUTBeeFghdYVp0sZIYX1I1Q6sjUAGxNpWXeYVvnX09k6ecSAZz9Q3oc9Tc1VBEjcPuKev5jIbPX0+ub/T0cQ== +"@polkadot/api-derive@^1.0.0-beta.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-1.0.0-beta.22.tgz#ce597c5e24d5f274d74de3b5c27a04ebaabedfcf" + integrity sha512-MsUZyiJW+w/qKqOfFtNldZOcrb9V3Ffkex/gGOHI6c/9CjcUxu50dN8EXcXIFRNaQx5NhIipuXgjUGvgVL/0Hg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/api" "^1.0.0-beta.19" - "@polkadot/types" "^1.0.0-beta.19" + "@polkadot/api" "^1.0.0-beta.22" + "@polkadot/types" "^1.0.0-beta.22" -"@polkadot/api@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-1.0.0-beta.19.tgz#5caaa19de76113064463ad81c3c2dac2e9ff466f" - integrity sha512-9a7qnQrwWdvir8Ud9DDxkVCD2L222jOLGTRez4e4VA5pdh2mQoZegXWihaMx1S+AdZed1FAtxHhYM/nRzvmOZQ== +"@polkadot/api@^1.0.0-beta.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-1.0.0-beta.22.tgz#d6c17b380bd768b44bc74fa069e6fe7704b28836" + integrity sha512-9RO8QtWqeM4b6T5y8XFXlPNeYscP5sMHUOlPne3wH7fNdkaILr1bUtWv8t8S+3duH2KL+Ltse4Om72/n8Yzztg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/api-derive" "^1.0.0-beta.19" + "@polkadot/api-derive" "^1.0.0-beta.22" "@polkadot/keyring" "^2.0.0-beta.6" - "@polkadot/metadata" "^1.0.0-beta.19" - "@polkadot/rpc-core" "^1.0.0-beta.19" - "@polkadot/rpc-provider" "^1.0.0-beta.19" - "@polkadot/types" "^1.0.0-beta.19" + "@polkadot/metadata" "^1.0.0-beta.22" + "@polkadot/rpc-core" "^1.0.0-beta.22" + "@polkadot/rpc-provider" "^1.0.0-beta.22" + "@polkadot/types" "^1.0.0-beta.22" "@polkadot/util-crypto" "^2.0.0-beta.6" "@polkadot/dev-react@^0.32.17": @@ -2314,25 +2314,25 @@ typescript "^3.7.5" vuepress "^1.2.0" -"@polkadot/extension-dapp@^0.15.0-beta.2": - version "0.15.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.15.0-beta.2.tgz#b9502eb1a3809a83e1ccdd74368d3e07c85bb331" - integrity sha512-MrMtJXMyFVtTS174FgceXn1/Vr27JR2Y72eiGSevIW+tIriFgrMFA7K81bbjsMsL3JTXQufUYNswgOBfemAoGA== +"@polkadot/extension-dapp@^0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@polkadot/extension-dapp/-/extension-dapp-0.20.1.tgz#ce190c5b7d6f44931c743bb0785633bc5e915b24" + integrity sha512-JImlo8lRygSh70Epj16ymvHxMHjPfzZwMi2QaqE4Us8HTeDX7j8Hh8jXrmr5NL7F0N+EfvvR5NbKHf6IK0f7ig== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/extension-inject" "^0.15.0-beta.2" + "@polkadot/extension-inject" "^0.20.1" -"@polkadot/extension-inject@^0.15.0-beta.2": - version "0.15.0-beta.2" - resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.15.0-beta.2.tgz#310a40698d61e905189783744f035d1774f81fc3" - integrity sha512-t1ZEThkwTlRtRexpdl3IbQoV1ZZRsWFT7v+483hFe/k+nVRdB3QF0mrZadN5hzObI0oeeCG+hAAjsVat8b6nWg== +"@polkadot/extension-inject@^0.20.1": + version "0.20.1" + resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.20.1.tgz#839b7c025fb3e18e4bfa02d2713614e46af713df" + integrity sha512-qZxJOUkYXdb/6Z8GIu0clenhcr0hu+qLek+DYcRnAgloQAadnVv/HfOXB2mhSLvBIu5J/ceizBMXteHuhq75aQ== dependencies: "@babel/runtime" "^7.8.3" -"@polkadot/jsonrpc@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-1.0.0-beta.19.tgz#0f45730e172979d417373b7504fa9d10b450ff60" - integrity sha512-3y2AZF9HYly/t0Ibkur2YKfnI/8mrnJ3MjWtX28+DLQRAberkHUsIGPpByRAAAvQDxpaX1N2GPdLSqXrucU8IA== +"@polkadot/jsonrpc@^1.0.0-beta.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-1.0.0-beta.22.tgz#13043c7a2f37615e6f35ff44593250e2377af966" + integrity sha512-O4wRvYZcq7MCbag/G6jUmaPGSehJmFDwiXqDxbpHoMn92Zd8DkQNKS788CjrxcgiN4vlap/Mc0UX0hrgbBrqzQ== dependencies: "@babel/runtime" "^7.8.3" @@ -2345,13 +2345,13 @@ "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" -"@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.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.22.tgz#93a8f4ba831402c469cd3b2c2169b930d895f47a" + integrity sha512-uzisWi3yuV4UQegJHNV4pbFMnUuDNEx4LlOPESICVwRmQjM6skbMqKObHHE5Q5VkzM7nBFq4X0CWHy3346r6QQ== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.19" + "@polkadot/types" "^1.0.0-beta.22" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" @@ -2379,25 +2379,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-1.0.0-beta.19.tgz#e2e8e4725e256898d03b7346d65ccdeb31ab4952" - integrity sha512-YYXn8aDe7aBrtwT10DcKWaSbGwL67s2MSnFWCaEkX7uymuvcXCkL2PS5Y8TRY++pydxWz9FeBM9FhRpuFyn0JA== +"@polkadot/rpc-core@^1.0.0-beta.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-1.0.0-beta.22.tgz#a7f820b4b6dc75b72a8d50e79811237dd6d44858" + integrity sha512-rWtA/k0eziK0ilZ0jvCZQFpzsWqSQxHP3gfaYqcMGP5Z+OmXp0hS3a5OGq3/4xAlUqfKYgPOrCR41W1GNWLRLg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/jsonrpc" "^1.0.0-beta.19" - "@polkadot/rpc-provider" "^1.0.0-beta.19" - "@polkadot/types" "^1.0.0-beta.19" + "@polkadot/jsonrpc" "^1.0.0-beta.22" + "@polkadot/rpc-provider" "^1.0.0-beta.22" + "@polkadot/types" "^1.0.0-beta.22" "@polkadot/util" "^2.0.0-beta.6" rxjs "^6.5.4" -"@polkadot/rpc-provider@^1.0.0-beta.19": - version "1.0.0-beta.19" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-1.0.0-beta.19.tgz#6f27cae3201be00fae0329234b1de538f5f5bd17" - integrity sha512-uCZgK+4ijssek2pp7f+rpDGTU7L600ZWbndQycQKIAuTUG1cTgLnYcRtXsJ+VJdWr34OBe70KdFd5LF4TOiFkA== +"@polkadot/rpc-provider@^1.0.0-beta.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-1.0.0-beta.22.tgz#fbe248d044fc64a77a5529ab35b31a0fdb973c88" + integrity sha512-1V8jHbKvuwM76Bwv6cFJ7ZFFAN0jAPXVKMOrjPVIuRhKU5S1U+oksRW36x34q/X1JJtIROaDbsWiAubZHSTzCA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.19" + "@polkadot/metadata" "^1.0.0-beta.22" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" eventemitter3 "^4.0.0" @@ -2411,13 +2411,13 @@ 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.22": + version "1.0.0-beta.22" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.22.tgz#d5c34fb7fdb8e7be7a03c7e7f666cd3e07aaa014" + integrity sha512-T4yQG010Pr1Olu45mWXaZOQ/UatMLbbTxvcGPznFMs6Ved3h4w9YGnoahQnyCnpo1VPc94etUHmRJoHkILQeEA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.19" + "@polkadot/metadata" "^1.0.0-beta.22" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" "@types/memoizee" "^0.4.3" @@ -5743,7 +5743,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== @@ -5966,7 +5966,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= @@ -8513,7 +8513,7 @@ i18next@*, i18next@^19.0.3: dependencies: "@babel/runtime" "^7.3.1" -iconv-lite@0.4.24, 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.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== @@ -11121,15 +11121,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" @@ -11267,22 +11258,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" @@ -11411,7 +11386,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== @@ -11443,7 +11418,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== @@ -14187,7 +14162,7 @@ rimraf@2.6.3, rimraf@~2.6.2: 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== @@ -14304,7 +14279,7 @@ sass-lookup@^3.0.0: dependencies: commander "^2.16.0" -sax@^1.2.4, sax@~1.2.4: +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== @@ -15379,7 +15354,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== From 68dcaf5493c0d6fe9a1f66d3bdc03180c2ed69a9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 14:06:51 +0100 Subject: [PATCH 2/8] Re-apply v10-era linked check --- packages/app-storage/src/Selection/Modules.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index 1e819acbd677..4cb043b0c4ff 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -55,7 +55,7 @@ function Modules ({ onAdd, t }: Props): React.ReactElement { }; const _onChangeKey = (key: StorageEntryPromise): void => { const asMap = key.creator.meta.type.isMap && key.creator.meta.type.asMap; - const isIterable = !!asMap && (asMap.kind.isLinkedMap || asMap.kind.isPrefixedMap); + const isIterable = !!asMap && asMap.linked.isTrue; setKey({ defaultValues: key.creator.section === 'session' && key.creator.meta.type.isDoubleMap From 1571556314041349c2825afddfb2124ffa97c478 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 14:09:50 +0100 Subject: [PATCH 3/8] Expand key inline --- packages/app-storage/src/Selection/Modules.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index 4cb043b0c4ff..0831268c38ec 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -54,19 +54,20 @@ function Modules ({ onAdd, t }: Props): React.ReactElement { }); }; const _onChangeKey = (key: StorageEntryPromise): void => { - const asMap = key.creator.meta.type.isMap && key.creator.meta.type.asMap; + const { creator: { meta, section } } = key; + const asMap = meta.type.isMap && meta.type.asMap; const isIterable = !!asMap && asMap.linked.isTrue; setKey({ - defaultValues: key.creator.section === 'session' && key.creator.meta.type.isDoubleMap + defaultValues: section === 'session' && meta.type.isDoubleMap ? [{ isValid: true, value: api.consts.session.dedupKeyPrefix.toHex() }] : null, isIterable, key, - params: key.creator.meta.type.isDoubleMap + params: meta.type.isDoubleMap ? [ - { type: getTypeDef(key.creator.meta.type.asDoubleMap.key1.toString()) }, - { type: getTypeDef(key.creator.meta.type.asDoubleMap.key2.toString()) } + { type: getTypeDef(meta.type.asDoubleMap.key1.toString()) }, + { type: getTypeDef(meta.type.asDoubleMap.key2.toString()) } ] : asMap ? [{ From d1ceacb646db4174058e62369a953c1034bd3db3 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 14:13:13 +0100 Subject: [PATCH 4/8] Expand type --- .../app-storage/src/Selection/Modules.tsx | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index 0831268c38ec..2d789260e3bf 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -54,27 +54,25 @@ function Modules ({ onAdd, t }: Props): React.ReactElement { }); }; const _onChangeKey = (key: StorageEntryPromise): void => { - const { creator: { meta, section } } = key; - const asMap = meta.type.isMap && meta.type.asMap; - const isIterable = !!asMap && asMap.linked.isTrue; + const { creator: { meta: { type }, section } } = key; setKey({ - defaultValues: section === 'session' && meta.type.isDoubleMap + defaultValues: section === 'session' && type.isDoubleMap ? [{ isValid: true, value: api.consts.session.dedupKeyPrefix.toHex() }] : null, - isIterable, + isIterable: type.isMap && type.asMap.linked.isTrue, key, - params: meta.type.isDoubleMap + params: type.isDoubleMap ? [ - { type: getTypeDef(meta.type.asDoubleMap.key1.toString()) }, - { type: getTypeDef(meta.type.asDoubleMap.key2.toString()) } + { type: getTypeDef(type.asDoubleMap.key1.toString()) }, + { type: getTypeDef(type.asDoubleMap.key2.toString()) } ] - : asMap + : type.isMap ? [{ type: getTypeDef( - isIterable - ? `Option<${asMap.key.toString()}>` - : asMap.key.toString() + type.asMap.linked.isTrue + ? `Option<${type.asMap.key.toString()}>` + : type.asMap.key.toString() ) }] : [] From be94616a26f8f4f6c6e28fe2b7074b282ed7803c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 14:24:09 +0100 Subject: [PATCH 5/8] Extract exraction logic --- .../app-storage/src/Selection/Modules.tsx | 106 +++++++++--------- 1 file changed, 55 insertions(+), 51 deletions(-) diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index 2d789260e3bf..bf208f46df00 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -3,37 +3,71 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { TypeDef } from '@polkadot/types/types'; -import { I18nProps } from '@polkadot/react-components/types'; import { RawParams } from '@polkadot/react-params/types'; -import { ComponentProps, StorageEntryPromise } from '../types'; +import { ComponentProps as Props, StorageEntryPromise } from '../types'; import React, { useState } from 'react'; -import { getTypeDef } from '@polkadot/types'; +import ApiPromise from '@polkadot/api/promise'; import { Button, InputStorage } from '@polkadot/react-components'; -import Params from '@polkadot/react-params'; import { useApi } from '@polkadot/react-hooks'; +import Params from '@polkadot/react-params'; +import { getTypeDef } from '@polkadot/types'; import { isNull, isUndefined } from '@polkadot/util'; -import translate from '../translate'; - -interface Props extends ComponentProps, I18nProps {} +import { useTranslation } from '../translate'; type ParamsType = { type: TypeDef }[]; -function areParamsValid (values: RawParams): boolean { - return values.reduce( - (isValid: boolean, value): boolean => ( - isValid && - !isUndefined(value) && - !isUndefined(value.value) && - value.isValid), - true - ); +interface KeyState { + defaultValues: RawParams | undefined | null; + isIterable: boolean; + key: StorageEntryPromise; + params: ParamsType; +} + +function areParamsValid ({ creator: { meta: { type } } }: StorageEntryPromise, values: RawParams): boolean { + return values.reduce((isValid: boolean, value): boolean => { + return isValid && + !isUndefined(value) && + !isUndefined(value.value) && + value.isValid; + }, ( + type.isDoubleMap + ? values.length === 2 + : values.length === (type.isMap ? 1 : 0) + )); +} + +function expandKey (api: ApiPromise, key: StorageEntryPromise): KeyState { + const { creator: { meta: { type }, section } } = key; + + return { + defaultValues: section === 'session' && type.isDoubleMap + ? [{ isValid: true, value: api.consts.session.dedupKeyPrefix.toHex() }] + : null, + isIterable: type.isMap && type.asMap.linked.isTrue, + key, + params: type.isDoubleMap + ? [ + { type: getTypeDef(type.asDoubleMap.key1.toString()) }, + { type: getTypeDef(type.asDoubleMap.key2.toString()) } + ] + : type.isMap + ? [{ + type: getTypeDef( + type.asMap.linked.isTrue + ? `Option<${type.asMap.key.toString()}>` + : type.asMap.key.toString() + ) + }] + : [] + }; } -function Modules ({ onAdd, t }: Props): React.ReactElement { +export default function Modules ({ onAdd }: Props): React.ReactElement { + const { t } = useTranslation(); const { api } = useApi(); - const [{ defaultValues, isIterable, key, params }, setKey] = useState<{ defaultValues: RawParams | undefined | null; isIterable: boolean; key: StorageEntryPromise; params: ParamsType }>({ defaultValues: undefined, isIterable: false, key: api.query.timestamp.now, params: [] }); + const [{ defaultValues, isIterable, key, params }, setKey] = useState({ defaultValues: undefined, isIterable: false, key: api.query.timestamp.now, params: [] }); const [{ isValid, values }, setValues] = useState<{ isValid: boolean; values: RawParams }>({ isValid: true, values: [] }); const _onAdd = (): void => { @@ -43,41 +77,13 @@ function Modules ({ onAdd, t }: Props): React.ReactElement { params: values.filter(({ value }): boolean => !isIterable || !isNull(value)) }); }; - const _onChangeValues = (values: RawParams): void => { + const _onChangeValues = (values: RawParams): void => setValues({ - isValid: ( - key.creator.meta.type.isDoubleMap - ? values.length === 2 - : values.length === (key.creator.meta.type.isMap ? 1 : 0) - ) && areParamsValid(values), + isValid: areParamsValid(key, values), values }); - }; const _onChangeKey = (key: StorageEntryPromise): void => { - const { creator: { meta: { type }, section } } = key; - - setKey({ - defaultValues: section === 'session' && type.isDoubleMap - ? [{ isValid: true, value: api.consts.session.dedupKeyPrefix.toHex() }] - : null, - isIterable: type.isMap && type.asMap.linked.isTrue, - key, - params: type.isDoubleMap - ? [ - { type: getTypeDef(type.asDoubleMap.key1.toString()) }, - { type: getTypeDef(type.asDoubleMap.key2.toString()) } - ] - : type.isMap - ? [{ - type: getTypeDef( - type.asMap.linked.isTrue - ? `Option<${type.asMap.key.toString()}>` - : type.asMap.key.toString() - ) - }] - : [] - }); - + setKey(expandKey(api, key)); _onChangeValues([]); }; @@ -111,5 +117,3 @@ function Modules ({ onAdd, t }: Props): React.ReactElement { ); } - -export default translate(Modules); From 30ce2845e702caffcdd6b92a0878ecf6fc4ff2f5 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 17:30:44 +0100 Subject: [PATCH 6/8] Latest API --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/react-api/package.json | 2 +- yarn.lock | 92 ++++++++++++++--------------- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 036a05a4a0f1..60d5df683ee3 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.0.0-beta.22", - "@polkadot/api-contract": "^1.0.0-beta.22", + "@polkadot/api": "^1.0.0-beta.24", + "@polkadot/api-contract": "^1.0.0-beta.24", "@polkadot/keyring": "^2.0.0-beta.6", - "@polkadot/types": "^1.0.0-beta.22", + "@polkadot/types": "^1.0.0-beta.24", "@polkadot/util": "^2.0.0-beta.6", "@polkadot/util-crypto": "^2.0.0-beta.6", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index f9deee80f0a9..d6f4b1034acd 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.8.3", - "@polkadot/api-contract": "^1.0.0-beta.22" + "@polkadot/api-contract": "^1.0.0-beta.24" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index b699e52b3038..54f392c9179e 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.8.3", - "@polkadot/api": "^1.0.0-beta.22", + "@polkadot/api": "^1.0.0-beta.24", "@polkadot/extension-dapp": "^0.20.1", "edgeware-node-types": "^1.1.0", "rxjs-compat": "^6.5.3" diff --git a/yarn.lock b/yarn.lock index 9f530247e02f..db3448ab01bc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2196,35 +2196,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-1.0.0-beta.22.tgz#c40b2ecdc5bc3e736f2a9e9314609a13c806cab2" - integrity sha512-2soKAqqMPKMhQdGhpvxlhsCwxgdKmO6SjqmxIHoPxQku2EIEB39PF0VYBRqfkpVxNXbBQTwLhQLI6dbM7OHsJA== +"@polkadot/api-contract@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-1.0.0-beta.24.tgz#b9970f773a2647a2a81209480834d3274e8bfd92" + integrity sha512-5Fcm9nxDpy2DkpWEJKX3NK7sBRbaLd6wtic2dl96SLAOAvE8xrwpKB2qjIGG3nZgjSt9RpecFax2w+ylYCNbsg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.22" + "@polkadot/types" "^1.0.0-beta.24" -"@polkadot/api-derive@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-1.0.0-beta.22.tgz#ce597c5e24d5f274d74de3b5c27a04ebaabedfcf" - integrity sha512-MsUZyiJW+w/qKqOfFtNldZOcrb9V3Ffkex/gGOHI6c/9CjcUxu50dN8EXcXIFRNaQx5NhIipuXgjUGvgVL/0Hg== +"@polkadot/api-derive@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-1.0.0-beta.24.tgz#cf1ed1ef05a5454c8e604d5b200776aeffc28724" + integrity sha512-+Sd5DdpXtR6NL3nHCl45YBRqcdVGe1EEZnYVEluOQIcIvy7/OX25fOwRJbwjYtNcTSUTBA52JdbkWAb3g2AuZA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/api" "^1.0.0-beta.22" - "@polkadot/types" "^1.0.0-beta.22" + "@polkadot/api" "^1.0.0-beta.24" + "@polkadot/types" "^1.0.0-beta.24" -"@polkadot/api@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-1.0.0-beta.22.tgz#d6c17b380bd768b44bc74fa069e6fe7704b28836" - integrity sha512-9RO8QtWqeM4b6T5y8XFXlPNeYscP5sMHUOlPne3wH7fNdkaILr1bUtWv8t8S+3duH2KL+Ltse4Om72/n8Yzztg== +"@polkadot/api@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-1.0.0-beta.24.tgz#b12486742bbd2727aa236dfd87a25b1b3b8d849d" + integrity sha512-LQhSr0745V/B3opVspLvgcQDq3/d6qb9qpXpWMFDC3MtBnQ8mUkvCyRYLauijWW3UfluRzvnYmgF7q3JGEJCYQ== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/api-derive" "^1.0.0-beta.22" + "@polkadot/api-derive" "^1.0.0-beta.24" "@polkadot/keyring" "^2.0.0-beta.6" - "@polkadot/metadata" "^1.0.0-beta.22" - "@polkadot/rpc-core" "^1.0.0-beta.22" - "@polkadot/rpc-provider" "^1.0.0-beta.22" - "@polkadot/types" "^1.0.0-beta.22" + "@polkadot/metadata" "^1.0.0-beta.24" + "@polkadot/rpc-core" "^1.0.0-beta.24" + "@polkadot/rpc-provider" "^1.0.0-beta.24" + "@polkadot/types" "^1.0.0-beta.24" "@polkadot/util-crypto" "^2.0.0-beta.6" "@polkadot/dev-react@^0.32.17": @@ -2329,10 +2329,10 @@ dependencies: "@babel/runtime" "^7.8.3" -"@polkadot/jsonrpc@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-1.0.0-beta.22.tgz#13043c7a2f37615e6f35ff44593250e2377af966" - integrity sha512-O4wRvYZcq7MCbag/G6jUmaPGSehJmFDwiXqDxbpHoMn92Zd8DkQNKS788CjrxcgiN4vlap/Mc0UX0hrgbBrqzQ== +"@polkadot/jsonrpc@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-1.0.0-beta.24.tgz#6cf8afeb8d1a6c9bfb538a40ef3d2e99c6d920be" + integrity sha512-SQoMyYgXQgageebm/IsVpDUr1Ws6LzMwqDIaYBb6yDz3lZb101EQoospHURlqY/xmitdX9ngHq+VwZtDrS70iA== dependencies: "@babel/runtime" "^7.8.3" @@ -2345,13 +2345,13 @@ "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" -"@polkadot/metadata@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.22.tgz#93a8f4ba831402c469cd3b2c2169b930d895f47a" - integrity sha512-uzisWi3yuV4UQegJHNV4pbFMnUuDNEx4LlOPESICVwRmQjM6skbMqKObHHE5Q5VkzM7nBFq4X0CWHy3346r6QQ== +"@polkadot/metadata@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.24.tgz#edf636fd4b97e6c3cb3e19749fcddf252fb42ee5" + integrity sha512-n8NuvvOYxSoG9SCDFLXYIZMG32njmh1jA/P+LMNKU+O8oLdRvZC7bFZ8h2madRQnSSBJzBh1xwTBHemg+nzUKw== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.22" + "@polkadot/types" "^1.0.0-beta.24" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" @@ -2379,25 +2379,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-1.0.0-beta.22.tgz#a7f820b4b6dc75b72a8d50e79811237dd6d44858" - integrity sha512-rWtA/k0eziK0ilZ0jvCZQFpzsWqSQxHP3gfaYqcMGP5Z+OmXp0hS3a5OGq3/4xAlUqfKYgPOrCR41W1GNWLRLg== +"@polkadot/rpc-core@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-1.0.0-beta.24.tgz#0a75e5ce10ffb77c2cd2712ffb50b3dd704e107f" + integrity sha512-PZvYsyQy5SDz1MUyPdraVnx6JrYCNBX/33TERZF7qKdFCIGIdSQQGL/I6NOmzPpWcGM67QE+OJXoM6AY9rImzA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/jsonrpc" "^1.0.0-beta.22" - "@polkadot/rpc-provider" "^1.0.0-beta.22" - "@polkadot/types" "^1.0.0-beta.22" + "@polkadot/jsonrpc" "^1.0.0-beta.24" + "@polkadot/rpc-provider" "^1.0.0-beta.24" + "@polkadot/types" "^1.0.0-beta.24" "@polkadot/util" "^2.0.0-beta.6" rxjs "^6.5.4" -"@polkadot/rpc-provider@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-1.0.0-beta.22.tgz#fbe248d044fc64a77a5529ab35b31a0fdb973c88" - integrity sha512-1V8jHbKvuwM76Bwv6cFJ7ZFFAN0jAPXVKMOrjPVIuRhKU5S1U+oksRW36x34q/X1JJtIROaDbsWiAubZHSTzCA== +"@polkadot/rpc-provider@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-1.0.0-beta.24.tgz#d48bc61ee73b752996f12e2826c50c777bc4a452" + integrity sha512-SplDTvJm6sHiCCa3v8/jtzeOHlz41DSaT07PDhKPhDn76DqlYGCVP+NYrN20jqxk3jpYSv0BKlKexGVKxGEXBA== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.22" + "@polkadot/metadata" "^1.0.0-beta.24" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" eventemitter3 "^4.0.0" @@ -2411,13 +2411,13 @@ dependencies: "@types/chrome" "^0.0.92" -"@polkadot/types@^1.0.0-beta.22": - version "1.0.0-beta.22" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.22.tgz#d5c34fb7fdb8e7be7a03c7e7f666cd3e07aaa014" - integrity sha512-T4yQG010Pr1Olu45mWXaZOQ/UatMLbbTxvcGPznFMs6Ved3h4w9YGnoahQnyCnpo1VPc94etUHmRJoHkILQeEA== +"@polkadot/types@^1.0.0-beta.24": + version "1.0.0-beta.24" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.24.tgz#cfbace3d680162e5232f6981b9077190afdfe6b5" + integrity sha512-3t0wSOH4L57URE/Yqx9rEGPWxEi+a1AJ+oIaBFY5zF602j8g6Kb3h4NWZg3oUFis8S21Ams0hY3FBlfrbFVcCg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.22" + "@polkadot/metadata" "^1.0.0-beta.24" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" "@types/memoizee" "^0.4.3" From 0f85cebdf49bd9682d0b259ce34596175e09628b Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 17:51:21 +0100 Subject: [PATCH 7/8] Fix linting around identity (now in metadata) --- packages/app-accounts/src/Account.tsx | 2 +- packages/app-address-book/src/Address.tsx | 2 +- packages/app-staking/src/Overview/Address.tsx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/app-accounts/src/Account.tsx b/packages/app-accounts/src/Account.tsx index ad49685b1b1f..d62be808c955 100644 --- a/packages/app-accounts/src/Account.tsx +++ b/packages/app-accounts/src/Account.tsx @@ -62,7 +62,7 @@ function Account ({ address, className, filter, isFavorite, toggleFavorite }: Pr useEffect((): void => { const { identity, nickname } = info || {}; - if (api.api.query.identity?.identityOf) { + if (api.api.query.identity && api.api.query.identity.identityOf) { if (identity?.display) { setAccName(identity.display); } diff --git a/packages/app-address-book/src/Address.tsx b/packages/app-address-book/src/Address.tsx index 5e44e0868b4f..6ebbabca7ba2 100644 --- a/packages/app-address-book/src/Address.tsx +++ b/packages/app-address-book/src/Address.tsx @@ -49,7 +49,7 @@ function Address ({ address, className, filter, isFavorite, toggleFavorite }: Pr useEffect((): void => { const { identity, nickname } = info || {}; - if (api.api.query.identity?.identityOf) { + if (api.api.query.identity && api.api.query.identity.identityOf) { if (identity?.display) { setAccName(identity.display); } diff --git a/packages/app-staking/src/Overview/Address.tsx b/packages/app-staking/src/Overview/Address.tsx index d50cf2fc9950..5cc687db23e1 100644 --- a/packages/app-staking/src/Overview/Address.tsx +++ b/packages/app-staking/src/Overview/Address.tsx @@ -114,7 +114,7 @@ function Address ({ address, authorsMap, className, filter, filterName, hasQueri if (accountId?.toString().includes(filterName) || accountIndex?.toString().includes(filterName)) { isVisible = true; - } else if (api.query.identity?.identityOf) { + } else if (api.query.identity && api.query.identity.identityOf) { if (identity?.display) { isVisible = identity.display.toLowerCase().includes(filterLower); } From 6c84e221a51609beca6a562772b6859022e5653c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 27 Jan 2020 19:51:56 +0100 Subject: [PATCH 8/8] Bump latest --- package.json | 6 +- packages/app-contracts/package.json | 2 +- packages/react-api/package.json | 2 +- yarn.lock | 92 ++++++++++++++--------------- 4 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 60d5df683ee3..8983fd392fce 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.0.0-beta.24", - "@polkadot/api-contract": "^1.0.0-beta.24", + "@polkadot/api": "^1.0.0-beta.25", + "@polkadot/api-contract": "^1.0.0-beta.25", "@polkadot/keyring": "^2.0.0-beta.6", - "@polkadot/types": "^1.0.0-beta.24", + "@polkadot/types": "^1.0.0-beta.25", "@polkadot/util": "^2.0.0-beta.6", "@polkadot/util-crypto": "^2.0.0-beta.6", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index d6f4b1034acd..3e623878cd46 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.8.3", - "@polkadot/api-contract": "^1.0.0-beta.24" + "@polkadot/api-contract": "^1.0.0-beta.25" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 54f392c9179e..534115ef6b46 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.8.3", - "@polkadot/api": "^1.0.0-beta.24", + "@polkadot/api": "^1.0.0-beta.25", "@polkadot/extension-dapp": "^0.20.1", "edgeware-node-types": "^1.1.0", "rxjs-compat": "^6.5.3" diff --git a/yarn.lock b/yarn.lock index db3448ab01bc..50bc24ffd0c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2196,35 +2196,35 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-1.0.0-beta.24.tgz#b9970f773a2647a2a81209480834d3274e8bfd92" - integrity sha512-5Fcm9nxDpy2DkpWEJKX3NK7sBRbaLd6wtic2dl96SLAOAvE8xrwpKB2qjIGG3nZgjSt9RpecFax2w+ylYCNbsg== +"@polkadot/api-contract@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-1.0.0-beta.25.tgz#af65e9305d136224d249e0b7f7d8dfdee27233b1" + integrity sha512-WG4aSmyZ0VdV64R7vBTQfyHTkYqm5hSPlYs2TXOyKcPTeQxlzcgSCaWlGeXqWkH5fY0dKrBNVYofV9uA8ymjew== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.24" + "@polkadot/types" "^1.0.0-beta.25" -"@polkadot/api-derive@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-1.0.0-beta.24.tgz#cf1ed1ef05a5454c8e604d5b200776aeffc28724" - integrity sha512-+Sd5DdpXtR6NL3nHCl45YBRqcdVGe1EEZnYVEluOQIcIvy7/OX25fOwRJbwjYtNcTSUTBA52JdbkWAb3g2AuZA== +"@polkadot/api-derive@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-1.0.0-beta.25.tgz#910b0c53516ec54234db72cc04961643eab8815d" + integrity sha512-wZW5WOzpK7NeFLdMzb5HlAHDJwmQ3CePlYrsR4eZyom2l3AfkzBw3Mxf1oltsKN3t563r98Lc0u0cGwEZOhYoQ== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/api" "^1.0.0-beta.24" - "@polkadot/types" "^1.0.0-beta.24" + "@polkadot/api" "^1.0.0-beta.25" + "@polkadot/types" "^1.0.0-beta.25" -"@polkadot/api@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-1.0.0-beta.24.tgz#b12486742bbd2727aa236dfd87a25b1b3b8d849d" - integrity sha512-LQhSr0745V/B3opVspLvgcQDq3/d6qb9qpXpWMFDC3MtBnQ8mUkvCyRYLauijWW3UfluRzvnYmgF7q3JGEJCYQ== +"@polkadot/api@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-1.0.0-beta.25.tgz#c617f4d38598a42b05c06caee1ce3769c7c10bbd" + integrity sha512-o6pbUnRGYTrTuH9OBiSbJg4A5KpbLYYXDb9SUYTMQAgRDhvDL/NQ+1YwzwTc42mj5hdH2pq9KKtgn5h3ghvgJQ== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/api-derive" "^1.0.0-beta.24" + "@polkadot/api-derive" "^1.0.0-beta.25" "@polkadot/keyring" "^2.0.0-beta.6" - "@polkadot/metadata" "^1.0.0-beta.24" - "@polkadot/rpc-core" "^1.0.0-beta.24" - "@polkadot/rpc-provider" "^1.0.0-beta.24" - "@polkadot/types" "^1.0.0-beta.24" + "@polkadot/metadata" "^1.0.0-beta.25" + "@polkadot/rpc-core" "^1.0.0-beta.25" + "@polkadot/rpc-provider" "^1.0.0-beta.25" + "@polkadot/types" "^1.0.0-beta.25" "@polkadot/util-crypto" "^2.0.0-beta.6" "@polkadot/dev-react@^0.32.17": @@ -2329,10 +2329,10 @@ dependencies: "@babel/runtime" "^7.8.3" -"@polkadot/jsonrpc@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-1.0.0-beta.24.tgz#6cf8afeb8d1a6c9bfb538a40ef3d2e99c6d920be" - integrity sha512-SQoMyYgXQgageebm/IsVpDUr1Ws6LzMwqDIaYBb6yDz3lZb101EQoospHURlqY/xmitdX9ngHq+VwZtDrS70iA== +"@polkadot/jsonrpc@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-1.0.0-beta.25.tgz#e7384c0f70fa77cc858ed75c78da4e8ae0ddf3b4" + integrity sha512-3kGaqlGxQSMFRcjI1zjAhtixl5IrJmcGOY2D5gSqqzMOpVAYCi8K+n0mLbqVp28uewxMP/LsAcw9RyY4+vpPgQ== dependencies: "@babel/runtime" "^7.8.3" @@ -2345,13 +2345,13 @@ "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" -"@polkadot/metadata@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.24.tgz#edf636fd4b97e6c3cb3e19749fcddf252fb42ee5" - integrity sha512-n8NuvvOYxSoG9SCDFLXYIZMG32njmh1jA/P+LMNKU+O8oLdRvZC7bFZ8h2madRQnSSBJzBh1xwTBHemg+nzUKw== +"@polkadot/metadata@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-1.0.0-beta.25.tgz#24a5fbcd8285fc25283fc4bccda3c32953f41edc" + integrity sha512-BGbTdETxseoktUuelhOlDwU3FZfNSDyyfrnNrMIltMQZGbr6i3awJRcxiXufyyuNjdvtcmdblUHQeFX4lv//Mg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/types" "^1.0.0-beta.24" + "@polkadot/types" "^1.0.0-beta.25" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" @@ -2379,25 +2379,25 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-1.0.0-beta.24.tgz#0a75e5ce10ffb77c2cd2712ffb50b3dd704e107f" - integrity sha512-PZvYsyQy5SDz1MUyPdraVnx6JrYCNBX/33TERZF7qKdFCIGIdSQQGL/I6NOmzPpWcGM67QE+OJXoM6AY9rImzA== +"@polkadot/rpc-core@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-1.0.0-beta.25.tgz#d80b07ebe663c493236dfa3022c70ab3e240a402" + integrity sha512-aq/Cx+FTT9Zw6mob47hKGXz8rcg2T35rvnIdgAULgMTjESti16pa/Pa4iQfMSV0l666MZ/JViUmDksIpiAljDg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/jsonrpc" "^1.0.0-beta.24" - "@polkadot/rpc-provider" "^1.0.0-beta.24" - "@polkadot/types" "^1.0.0-beta.24" + "@polkadot/jsonrpc" "^1.0.0-beta.25" + "@polkadot/rpc-provider" "^1.0.0-beta.25" + "@polkadot/types" "^1.0.0-beta.25" "@polkadot/util" "^2.0.0-beta.6" rxjs "^6.5.4" -"@polkadot/rpc-provider@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-1.0.0-beta.24.tgz#d48bc61ee73b752996f12e2826c50c777bc4a452" - integrity sha512-SplDTvJm6sHiCCa3v8/jtzeOHlz41DSaT07PDhKPhDn76DqlYGCVP+NYrN20jqxk3jpYSv0BKlKexGVKxGEXBA== +"@polkadot/rpc-provider@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-1.0.0-beta.25.tgz#afd73cd8cd4f5060ee3d16f519566fba5115be32" + integrity sha512-aYEEYblJMbCcLsD6UgcUooD3S7AJHb9/BeXYaMVy1u6+BfYZApxNxcrF8w7Y7IXpgguPSgtQXBstsAo6RUfijg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.24" + "@polkadot/metadata" "^1.0.0-beta.25" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" eventemitter3 "^4.0.0" @@ -2411,13 +2411,13 @@ dependencies: "@types/chrome" "^0.0.92" -"@polkadot/types@^1.0.0-beta.24": - version "1.0.0-beta.24" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.24.tgz#cfbace3d680162e5232f6981b9077190afdfe6b5" - integrity sha512-3t0wSOH4L57URE/Yqx9rEGPWxEi+a1AJ+oIaBFY5zF602j8g6Kb3h4NWZg3oUFis8S21Ams0hY3FBlfrbFVcCg== +"@polkadot/types@^1.0.0-beta.25": + version "1.0.0-beta.25" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-1.0.0-beta.25.tgz#ae9a49dcabce7b518b91f0718cc7941c14c91bd3" + integrity sha512-Ut0Vg0r2NM96eU8iXQh6HXH68OnPXBv2P1wysDxuFHWvQ/xjEu8LxWtwOTqQzb5UqhL1FdUvSxTKfXVGh5MDgg== dependencies: "@babel/runtime" "^7.8.3" - "@polkadot/metadata" "^1.0.0-beta.24" + "@polkadot/metadata" "^1.0.0-beta.25" "@polkadot/util" "^2.0.0-beta.6" "@polkadot/util-crypto" "^2.0.0-beta.6" "@types/memoizee" "^0.4.3"