diff --git a/package.json b/package.json index 44da027dc6..c7725badc4 100644 --- a/package.json +++ b/package.json @@ -8,10 +8,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.15.0-beta.3", - "@polkadot/api-contract": "^1.15.0-beta.3", + "@polkadot/api": "^1.15.0-beta.5", + "@polkadot/api-contract": "^1.15.0-beta.5", "@polkadot/keyring": "^2.10.1", - "@polkadot/types": "^1.15.0-beta.3", + "@polkadot/types": "^1.15.0-beta.5", "@polkadot/util": "^2.10.1", "@polkadot/util-crypto": "^2.10.1", "babel-core": "^7.0.0-bridge.0" diff --git a/packages/apps/src/index.tsx b/packages/apps/src/index.tsx index 9d31d5c3a3..e5f4881562 100644 --- a/packages/apps/src/index.tsx +++ b/packages/apps/src/index.tsx @@ -10,6 +10,7 @@ import '@polkadot/react-components/i18n'; import React, { Suspense } from 'react'; import ReactDOM from 'react-dom'; import { HashRouter } from 'react-router-dom'; +import store from 'store'; import { ThemeProvider } from 'styled-components'; import AccountSidebar from '@polkadot/app-accounts/Sidebar'; import { Api } from '@polkadot/react-api'; @@ -27,6 +28,13 @@ if (!rootElement) { throw new Error(`Unable to find element with id '${rootId}'`); } +// cleanups for old/unused storage items +store.each((_, key): void => { + if (key.startsWith('hooks:sessionSlashes:')) { + store.remove(key); + } +}); + ReactDOM.render( diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index fc60a0e829..c14266c0a7 100644 --- a/packages/page-contracts/package.json +++ b/packages/page-contracts/package.json @@ -12,6 +12,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.9.6", - "@polkadot/api-contract": "^1.15.0-beta.3" + "@polkadot/api-contract": "^1.15.0-beta.5" } } diff --git a/packages/react-api/package.json b/packages/react-api/package.json index 52a2a38110..9929aedc09 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.9.6", - "@polkadot/api": "^1.15.0-beta.3", + "@polkadot/api": "^1.15.0-beta.5", "@polkadot/extension-dapp": "^0.26.0-beta.1", "rxjs-compat": "^6.5.5" } diff --git a/packages/react-api/src/Api.tsx b/packages/react-api/src/Api.tsx index 9d93f72057..8b1b6f9f15 100644 --- a/packages/react-api/src/Api.tsx +++ b/packages/react-api/src/Api.tsx @@ -8,6 +8,7 @@ import { ApiProps, ApiState } from './types'; import React, { useContext, useEffect, useMemo, useState } from 'react'; import ApiPromise from '@polkadot/api/promise'; +import { setDeriveCache, deriveMapCache } from '@polkadot/api-derive/util'; import { typesChain, typesSpec } from '@polkadot/apps-config/api'; import { web3Accounts, web3Enable } from '@polkadot/extension-dapp'; import { WsProvider } from '@polkadot/rpc-provider'; @@ -131,6 +132,8 @@ async function loadOnReady (api: ApiPromise): Promise { const apiDefaultTxSudo = (api.tx.system && api.tx.system.setCode) || apiDefaultTx; const isSubstrateV2 = !!Object.keys(api.consts).length; + setDeriveCache(api.genesisHash.toHex(), deriveMapCache); + return { apiDefaultTx, apiDefaultTxSudo, diff --git a/yarn.lock b/yarn.lock index 7b69e87318..23ca7a148c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2848,57 +2848,57 @@ __metadata: languageName: node linkType: hard -"@polkadot/api-contract@npm:^1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/api-contract@npm:1.15.0-beta.3" +"@polkadot/api-contract@npm:^1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/api-contract@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/api": 1.15.0-beta.3 - "@polkadot/rpc-core": 1.15.0-beta.3 - "@polkadot/types": 1.15.0-beta.3 + "@polkadot/api": 1.15.0-beta.5 + "@polkadot/rpc-core": 1.15.0-beta.5 + "@polkadot/types": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 bn.js: ^5.1.1 rxjs: ^6.5.5 - checksum: 3/94997d77b545ff078a668e64e87fc599b72bf25119b36e7c4079909190288f4574ed2baa451b1ae6171826cce2c09de8f28a3f55593c0b2cd8d8c21f7df310cf + checksum: 3/bf4e933d60ed6b7de4d5badb6a0f95826d06af0843d51355165f71931fdf4af3a88ef1fe2f45941cceb370cd195245efbf79a9aeee4cac8a9ae664580ae2a852 languageName: node linkType: hard -"@polkadot/api-derive@npm:1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/api-derive@npm:1.15.0-beta.3" +"@polkadot/api-derive@npm:1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/api-derive@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/api": 1.15.0-beta.3 - "@polkadot/rpc-core": 1.15.0-beta.3 - "@polkadot/rpc-provider": 1.15.0-beta.3 - "@polkadot/types": 1.15.0-beta.3 + "@polkadot/api": 1.15.0-beta.5 + "@polkadot/rpc-core": 1.15.0-beta.5 + "@polkadot/rpc-provider": 1.15.0-beta.5 + "@polkadot/types": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 "@polkadot/util-crypto": ^2.10.1 bn.js: ^5.1.1 memoizee: ^0.4.14 rxjs: ^6.5.5 - checksum: 3/fbd3c850092dc7eba2238afd2489486f905bb7a369dcac26be8cce1d1ceb184bfe655620510e4d9568e237aaf6b2df93662fa156704540a568f7eea268942f8c + checksum: 3/40b4a93b74bb7d09d19011289d0f7d2b7cb4ffac930f7952781c72ff056be55ab38fa920d94c2011992a6e7f70e2a6f2dce3b9f859d070a65a387f14cdaf6a0d languageName: node linkType: hard -"@polkadot/api@npm:^1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/api@npm:1.15.0-beta.3" +"@polkadot/api@npm:^1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/api@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/api-derive": 1.15.0-beta.3 + "@polkadot/api-derive": 1.15.0-beta.5 "@polkadot/keyring": ^2.10.1 - "@polkadot/metadata": 1.15.0-beta.3 - "@polkadot/rpc-core": 1.15.0-beta.3 - "@polkadot/rpc-provider": 1.15.0-beta.3 - "@polkadot/types": 1.15.0-beta.3 - "@polkadot/types-known": 1.15.0-beta.3 + "@polkadot/metadata": 1.15.0-beta.5 + "@polkadot/rpc-core": 1.15.0-beta.5 + "@polkadot/rpc-provider": 1.15.0-beta.5 + "@polkadot/types": 1.15.0-beta.5 + "@polkadot/types-known": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 "@polkadot/util-crypto": ^2.10.1 bn.js: ^5.1.1 eventemitter3: ^4.0.4 rxjs: ^6.5.5 - checksum: 3/1601af93b75214210fd047125e907ef1a973cb806bad11e96d48112ef5b2411165509c2e5fa2debb66aa1645bf1215f78913e96e4537b5e0e33fc8caea8c593f + checksum: 3/ecdfd9a888ff27bfdbed259bb90a51db06f5c46b095b9917eba87bbcc14c2e86e708ac16c5abc7f8cb825e27f305a174fcf2b7f0522db1431abb6a67fe00587f languageName: node linkType: hard @@ -2939,7 +2939,7 @@ __metadata: resolution: "@polkadot/app-contracts@workspace:packages/page-contracts" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/api-contract": ^1.15.0-beta.3 + "@polkadot/api-contract": ^1.15.0-beta.5 languageName: unknown linkType: soft @@ -3274,17 +3274,17 @@ __metadata: languageName: node linkType: hard -"@polkadot/metadata@npm:1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/metadata@npm:1.15.0-beta.3" +"@polkadot/metadata@npm:1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/metadata@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/types": 1.15.0-beta.3 - "@polkadot/types-known": 1.15.0-beta.3 + "@polkadot/types": 1.15.0-beta.5 + "@polkadot/types-known": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 "@polkadot/util-crypto": ^2.10.1 bn.js: ^5.1.1 - checksum: 3/498bad03af78a52f07f4561e346d66bbc41e9298526fe2a86fe8a4261d55665ccea294ea64486ade8e7ac1adddda04a8a24da6b3d50db7b6a0a1e69025cc9780 + checksum: 3/f2ede4e61f70b674c9cf41a27da04662b124871fc68fdd2b6fb684220c971c9908e44d62b24fd803df7f6fc79548e4fa1042f3fbe1c4b556015bc344be07c56c languageName: node linkType: hard @@ -3293,7 +3293,7 @@ __metadata: resolution: "@polkadot/react-api@workspace:packages/react-api" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/api": ^1.15.0-beta.3 + "@polkadot/api": ^1.15.0-beta.5 "@polkadot/extension-dapp": ^0.26.0-beta.1 rxjs-compat: ^6.5.5 languageName: unknown @@ -3409,35 +3409,35 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/rpc-core@npm:1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/rpc-core@npm:1.15.0-beta.3" +"@polkadot/rpc-core@npm:1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/rpc-core@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/metadata": 1.15.0-beta.3 - "@polkadot/rpc-provider": 1.15.0-beta.3 - "@polkadot/types": 1.15.0-beta.3 + "@polkadot/metadata": 1.15.0-beta.5 + "@polkadot/rpc-provider": 1.15.0-beta.5 + "@polkadot/types": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 memoizee: ^0.4.14 rxjs: ^6.5.5 - checksum: 3/245cb6813a52cdb092ec4c47d4f785a67248ed0f9443acd2b0895701e270015ed07b7b139c0c5157aead1c52406659b219b453d3c5cc0288913e6e736285210c + checksum: 3/7b913ddb6ae69c57a836ecc40a55725d8052f06f9a6eab137175297c944230a17af1fd60ccf265bec6413b3171b50ffc8adbc3626c3c32902c10dd371a338ce7 languageName: node linkType: hard -"@polkadot/rpc-provider@npm:1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/rpc-provider@npm:1.15.0-beta.3" +"@polkadot/rpc-provider@npm:1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/rpc-provider@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/metadata": 1.15.0-beta.3 - "@polkadot/types": 1.15.0-beta.3 + "@polkadot/metadata": 1.15.0-beta.5 + "@polkadot/types": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 "@polkadot/util-crypto": ^2.10.1 bn.js: ^5.1.1 eventemitter3: ^4.0.4 isomorphic-fetch: ^2.2.1 websocket: ^1.0.31 - checksum: 3/686b7a790817245e3b6be846ea0a23a7e4a3a68b6971070e7b8dbed96fffd1dcc1db610520f9f7b78515f995381074feda19ab5e837e209e221e50ce1e292986 + checksum: 3/a829373073bf581ed5ece81ecf1f2ffbb357c1ea50bd6f87e4b5ecb4f6dab4166fac8674671f99f4fb4e5a69c9baa2562a25349385115acea3e0137f1a6b38d8 languageName: node linkType: hard @@ -3450,31 +3450,31 @@ __metadata: languageName: node linkType: hard -"@polkadot/types-known@npm:1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/types-known@npm:1.15.0-beta.3" +"@polkadot/types-known@npm:1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/types-known@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/types": 1.15.0-beta.3 + "@polkadot/types": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 bn.js: ^5.1.1 - checksum: 3/b4fb936c0b29e2065dfda9cba2de6058882f5489de675adb7d103dd3148fd5ebca4da2f5d821035871c9284990d4eebd4e722adb8dc375532eb5485d576c72af + checksum: 3/f78b66c378e25968a88c0c28ec380aa04d54358a19f0a45b457b2453b909bd9507d30cb93a25ba0a08b6122ee08c46091f9d91f5f22f350a1cfba65823f170b4 languageName: node linkType: hard -"@polkadot/types@npm:^1.15.0-beta.3": - version: 1.15.0-beta.3 - resolution: "@polkadot/types@npm:1.15.0-beta.3" +"@polkadot/types@npm:^1.15.0-beta.5": + version: 1.15.0-beta.5 + resolution: "@polkadot/types@npm:1.15.0-beta.5" dependencies: "@babel/runtime": ^7.9.6 - "@polkadot/metadata": 1.15.0-beta.3 + "@polkadot/metadata": 1.15.0-beta.5 "@polkadot/util": ^2.10.1 "@polkadot/util-crypto": ^2.10.1 "@types/bn.js": ^4.11.6 bn.js: ^5.1.1 memoizee: ^0.4.14 rxjs: ^6.5.5 - checksum: 3/6caebed9e69d0cdeec48bfd73daa434e1e53dcdb2792bf9148f4b5ee6fa66408e15e87215cb167e197b2e6f6913307d982daddc604a0b7175329193f789752a2 + checksum: 3/4e05652c2815b20fc638d35122b0a1f23c12d9cd8fa97076592bfebd886932368af6538605c49016fc5d0620c948dd47e9c0a30acec472be07582f02ae0a723d languageName: node linkType: hard