Cleanup @polkadot/types imports (#711)

packages/app-democracy/src/Proposal.tsx

@@ -6,8 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { AccountId, Balance, Proposal } from '@polkadot/types';
-import { Tuple, Vector } from '@polkadot/types/codec';
+import { AccountId, Balance, Proposal, Tuple, Vector } from '@polkadot/types';
 import { AddressMini, Labelled, Static } from '@polkadot/ui-app/index';
 import { withCall, withMulti } from '@polkadot/ui-api/index';
 import { formatBalance } from '@polkadot/ui-app/util/index';

packages/app-democracy/src/Proposals.tsx

@@ -5,7 +5,7 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Tuple } from '@polkadot/types/codec';
+import { Tuple } from '@polkadot/types';
 import { withCall, withMulti } from '@polkadot/ui-api/index';
 
 import Proposal from './Proposal';

packages/app-explorer/src/BlockByHash/BlockByHash.tsx

@@ -6,8 +6,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import { ApiProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { EventRecord, SignedBlock } from '@polkadot/types';
-import { HeaderExtended } from '@polkadot/types/Header';
+import { EventRecord, HeaderExtended, SignedBlock } from '@polkadot/types';
 import { withCalls } from '@polkadot/ui-api/index';
 
 import BlockHeader from '../BlockHeader';

packages/app-explorer/src/BlockByHash/Logs.tsx

@@ -5,8 +5,7 @@
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { Struct, Tuple, U8a, Vector, getTypeDef } from '@polkadot/types/codec';
-import { DigestItem } from '@polkadot/types/Digest';
+import { DigestItem, Struct, Tuple, U8a, Vector, getTypeDef } from '@polkadot/types';
 import Params from '@polkadot/ui-params/index';
 
 import translate from '../translate';

packages/app-explorer/src/BlockHeader/index.tsx

@@ -8,7 +8,7 @@ import './BlockHeader.css';
 
 import React from 'react';
 import { Link } from 'react-router-dom';
-import { HeaderExtended } from '@polkadot/types/Header';
+import { HeaderExtended } from '@polkadot/types';
 import { AddressMini } from '@polkadot/ui-app/index';
 import { formatNumber } from '@polkadot/ui-app/util';
 

packages/app-explorer/src/BlockHeaders.tsx

@@ -5,7 +5,7 @@
 import { CallProps } from '@polkadot/ui-api/types';
 
 import React from 'react';
-import { HeaderExtended } from '@polkadot/types/Header';
+import { HeaderExtended } from '@polkadot/types';
 import { withCall } from '@polkadot/ui-api/index';
 
 import BlockHeader from './BlockHeader';

packages/app-extrinsics/src/Extrinsic.tsx

@@ -8,8 +8,7 @@ import { ApiProps } from '@polkadot/ui-api/types';
 import { RawParam } from '@polkadot/ui-params/types';
 
 import React from 'react';
-import { TypeDef, getTypeDef } from '@polkadot/types/codec';
-import { Method } from '@polkadot/types';
+import { Method, TypeDef, getTypeDef } from '@polkadot/types';
 
 import { InputExtrinsic } from '@polkadot/ui-app/index';
 import Params from '@polkadot/ui-params/index';

packages/app-settings/src/index.tsx

@@ -9,7 +9,7 @@ import { SettingsStruct } from '@polkadot/ui-settings/types';
 import React from 'react';
 import { Route, Switch } from 'react-router';
 import store from 'store';
-import typeRegistry from '@polkadot/types/codec/typeRegistry';
+import { typeRegistry } from '@polkadot/types';
 import { Button, Dropdown, Input, InputFile, Tabs } from '@polkadot/ui-app/index';
 import uiSettings from '@polkadot/ui-settings';
 import { u8aToString } from '@polkadot/util';

packages/app-staking/src/Overview/CurrentList.tsx

@@ -6,8 +6,7 @@ import { DerivedBalancesMap } from '@polkadot/api-derive/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 
 import React from 'react';
-import { AccountId, Balance } from '@polkadot/types';
-import { HeaderExtended } from '@polkadot/types/Header';
+import { AccountId, Balance, HeaderExtended } from '@polkadot/types';
 import { withCall, withMulti } from '@polkadot/ui-api/with';
 import { AddressMini, AddressRow } from '@polkadot/ui-app/index';
 import { formatNumber } from '@polkadot/ui-app/util';

packages/app-storage/src/Query.tsx

@@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types';
 import { QueryTypes, StorageModuleQuery } from './types';
 
 import React from 'react';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { Button, Labelled } from '@polkadot/ui-app/index';
 import valueToText from '@polkadot/ui-params/valueToText';
 import { withCallDiv } from '@polkadot/ui-api/index';

packages/app-storage/src/Selection/Modules.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef, getTypeDef } from '@polkadot/types/codec';
+import { TypeDef, getTypeDef } from '@polkadot/types';
 import { StorageFunction } from '@polkadot/types/StorageKey';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { RawParams } from '@polkadot/ui-params/types';

packages/app-storage/src/Selection/Raw.tsx

@@ -10,7 +10,7 @@ import { Button, Input } from '@polkadot/ui-app/index';
 
 import translate from '../translate';
 import { u8aToU8a } from '@polkadot/util';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 
 type Props = ComponentProps & I18nProps;
 

packages/app-toolbox/src/Rpc/Selection.tsx

@@ -11,7 +11,7 @@ import './index.css';
 
 import React from 'react';
 import rpc from '@polkadot/jsonrpc';
-import { getTypeDef } from '@polkadot/types/codec';
+import { getTypeDef } from '@polkadot/types';
 import { Button, InputRpc } from '@polkadot/ui-app/index';
 import Params from '@polkadot/ui-params/index';
 

packages/apps/src/index.tsx

@@ -8,7 +8,7 @@ import './index.css';
 
 import React from 'react';
 import store from 'store';
-import typeRegistry from '@polkadot/types/codec/typeRegistry';
+import { typeRegistry } from '@polkadot/types';
 import createApp from '@polkadot/ui-app/index';
 import { classes } from '@polkadot/ui-app/util';
 import Signer from '@polkadot/ui-signer/index';

packages/ui-api/package.json

@@ -31,7 +31,7 @@
   "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
   "dependencies": {
     "@babel/runtime": "^7.2.0",
-    "@polkadot/api": "^0.42.15",
+    "@polkadot/api": "^0.42.18",
     "rxjs-compat": "^6.3.2"
   }
 }

packages/ui-app/package.json

@@ -11,10 +11,7 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.2.0",
-    "@polkadot/extrinsics": "^0.42.15",
     "@polkadot/keyring": "^0.33.36",
-    "@polkadot/storage": "^0.42.15",
-    "@polkadot/types": "^0.42.15",
     "@polkadot/ui-api": "^0.23.24",
     "@polkadot/ui-identicon": "^0.25.11",
     "@polkadot/ui-keyring": "^0.25.11",

packages/ui-app/src/Call.tsx

@@ -2,11 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { getTypeDef } from '@polkadot/types/codec';
 import { BareProps } from './types';
 
 import React from 'react';
-import { Extrinsic, Method, Proposal } from '@polkadot/types';
+import { Extrinsic, Method, Proposal, getTypeDef } from '@polkadot/types';
 import Params from '@polkadot/ui-params/index';
 
 import classes from './util/classes';

packages/ui-app/src/CardSummary.tsx

@@ -6,7 +6,7 @@ import { BareProps } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { UInt } from '@polkadot/types/codec';
+import { UInt } from '@polkadot/types';
 import { isUndefined } from '@polkadot/util';
 
 import Progress, { Colors as ProgressColors } from './Progress';

packages/ui-app/src/Event.tsx

@@ -2,11 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { getTypeDef } from '@polkadot/types/codec';
 import { BareProps } from './types';
 
 import React from 'react';
-import { Event } from '@polkadot/types';
+import { Event, getTypeDef } from '@polkadot/types';
 import Params from '@polkadot/ui-params/index';
 
 import classes from './util/classes';

packages/ui-app/src/Progress.tsx

@@ -7,7 +7,7 @@ import { BareProps } from './types';
 import BN from 'bn.js';
 import React from 'react';
 import SUIProgress from 'semantic-ui-react/dist/commonjs/modules/Progress/Progress';
-import { UInt } from '@polkadot/types/codec';
+import { UInt } from '@polkadot/types';
 import { bnToBn, isBn, isUndefined } from '@polkadot/util';
 
 import classes from './util/classes';

packages/ui-app/src/Status/types.ts

@@ -5,7 +5,7 @@
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { RpcMethod } from '@polkadot/jsonrpc/types';
 import { AccountId, Address } from '@polkadot/types';
-import { SignatureOptions } from '@polkadot/types/ExtrinsicSignature';
+import { SignatureOptions } from '@polkadot/types/types';
 
 export type Actions = 'create' | 'edit' | 'restore' | 'forget' | 'backup' | 'changePassword' | 'transfer';
 

packages/ui-app/src/util/formatNumber.ts

@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import BN from 'bn.js';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { bnToBn } from '@polkadot/util';
 
 import formatDecimal from './formatDecimal';

packages/ui-params/src/Param/BaseBytes.tsx

@@ -5,7 +5,7 @@
 import { Props as BaseProps, Size } from '../types';
 
 import React from 'react';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { Input } from '@polkadot/ui-app/index';
 import { hexToU8a, isHex, u8aToHex } from '@polkadot/util';
 

packages/ui-params/src/Param/Bytes.tsx

@@ -5,7 +5,7 @@
 import { Props } from '../types';
 
 import React from 'react';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { Button } from '@polkadot/ui-app/index';
 
 import BaseBytes from './BaseBytes';

packages/ui-params/src/Param/KeyValue.tsx

@@ -5,7 +5,7 @@
 import { Props } from '../types';
 
 import React from 'react';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { Input } from '@polkadot/ui-app/index';
 import { hexToU8a, u8aConcat } from '@polkadot/util';
 

packages/ui-params/src/Param/KeyValueArray.tsx

@@ -6,8 +6,7 @@ import { WithNamespaces } from 'react-i18next';
 import { Props as BaseProps, RawParam } from '../types';
 
 import React from 'react';
-import { Vector } from '@polkadot/types/codec';
-import { KeyValue as Pair } from '@polkadot/types';
+import { KeyValue as Pair, Vector } from '@polkadot/types';
 import translate from '@polkadot/ui-app/translate';
 import { assert, isHex, u8aToHex, u8aToString } from '@polkadot/util';
 

packages/ui-params/src/Param/Tuple.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef } from '@polkadot/types/codec';
+import { TypeDef } from '@polkadot/types';
 import { Props, RawParam } from '../types';
 
 import React from 'react';

packages/ui-params/src/Param/Vector.tsx

@@ -3,7 +3,7 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { WithNamespaces } from 'react-i18next';
-import { TypeDef } from '@polkadot/types/codec';
+import { TypeDef } from '@polkadot/types';
 import { Props as BareProps, RawParam } from '../types';
 
 import React from 'react';

packages/ui-params/src/Param/findComponent.ts

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef, TypeDefInfo } from '@polkadot/types/codec';
+import { TypeDef, TypeDefInfo } from '@polkadot/types';
 import { Props, ComponentMap } from '../types';
 
 import Account from './Account';
@@ -25,9 +25,11 @@ import VoteThreshold from './VoteThreshold';
 
 const components: ComponentMap = {
   'AccountId': Account,
+  'AccountIdOf': Account,
   'AccountIndex': Amount,
   'Address': Account,
   'Balance': Balance,
+  'BalanceOf': Balance,
   'BlockNumber': Amount,
   'bool': Bool,
   'Bytes': Bytes,
@@ -40,10 +42,12 @@ const components: ComponentMap = {
   'Vec<KeyValue>': KeyValueArray,
   'ParaId': Amount,
   'Moment': Moment,
+  'MomentOf': Moment,
   'ProposalIndex': Amount,
   'PropIndex': Amount,
   'Proposal': Proposal,
   'ReferendumIndex': Amount,
+  'SeedOf': Hash,
   'SessionKey': Account,
   'Signature': Hash,
   'String': Text,

packages/ui-params/src/index.tsx

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef } from '@polkadot/types/codec';
+import { TypeDef } from '@polkadot/types';
 import { I18nProps } from '@polkadot/ui-app/types';
 import { ComponentMap, RawParams, RawParam$OnChange, RawParam$OnChange$Value } from './types';
 

packages/ui-params/src/initValue.ts

@@ -2,11 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef, TypeDefInfo } from '@polkadot/types/codec';
 import { RawParam$Value } from './types';
 
 import BN from 'bn.js';
-import { Bytes, Hash } from '@polkadot/types';
+import { Bytes, Hash, TypeDef, TypeDefInfo } from '@polkadot/types';
 
 export default function getInitValue (def: TypeDef): RawParam$Value | Array<RawParam$Value> {
   if (def.info === TypeDefInfo.Vector) {

packages/ui-params/src/types.ts

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef } from '@polkadot/types/codec';
+import { TypeDef } from '@polkadot/types';
 import { BareProps } from '@polkadot/ui-app/types';
 
 // FIXME Ideally, we want these as Base from api-codec - as a stop-gap, any this until we have

packages/ui-params/src/values.ts

@@ -2,7 +2,7 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { TypeDef } from '@polkadot/types/codec';
+import { TypeDef } from '@polkadot/types';
 import { RawParam } from './types';
 
 import { isUndefined } from '@polkadot/util';

packages/ui-reactive/package.json

@@ -31,7 +31,7 @@
   "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme",
   "dependencies": {
     "@babel/runtime": "^7.2.0",
-    "@polkadot/api": "^0.42.15",
+    "@polkadot/api": "^0.42.18",
     "rxjs-compat": "^6.3.2"
   }
 }

packages/ui-signer/src/ApiSigner.ts

@@ -6,8 +6,9 @@ import { Signer } from '@polkadot/api/types';
 import { SubmittableResult } from '@polkadot/api';
 import { SubmittableExtrinsic } from '@polkadot/api/promise/types';
 import { QueueTx$ExtrinsicAdd, QueueTx$MessageSetStatus } from '@polkadot/ui-app/Status/types';
+import { SignatureOptions } from '@polkadot/types/types';
+
 import { Hash } from '@polkadot/types';
-import { SignatureOptions } from '@polkadot/types/ExtrinsicSignature';
 
 export default class ApiSigner implements Signer {
   private _queueExtrinsic: QueueTx$ExtrinsicAdd;

packages/ui-signer/src/Checks/Proposal.tsx

@@ -8,7 +8,7 @@ import { ExtraFees } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { withCall, withMulti } from '@polkadot/ui-api/index';
 import { Icon } from '@polkadot/ui-app/index';
 import { formatBalance } from '@polkadot/ui-app/util';

packages/ui-signer/src/Checks/Transfer.tsx

@@ -8,7 +8,7 @@ import { ExtraFees } from './types';
 
 import BN from 'bn.js';
 import React from 'react';
-import { Compact } from '@polkadot/types/codec';
+import { Compact } from '@polkadot/types';
 import { withCall, withMulti } from '@polkadot/ui-api/index';
 import { Icon } from '@polkadot/ui-app/index';
 import { formatBalance } from '@polkadot/ui-app/util';

packages/ui-signer/src/Modal.tsx

@@ -8,8 +8,8 @@ import { ApiProps } from '@polkadot/ui-api/types';
 import { I18nProps, BareProps } from '@polkadot/ui-app/types';
 import { RpcMethod } from '@polkadot/jsonrpc/types';
 import { KeyringPair } from '@polkadot/keyring/types';
+import { SignatureOptions } from '@polkadot/types/types';
 import { SubjectInfo } from '@polkadot/ui-keyring/observable/types';
-import { SignatureOptions } from '@polkadot/types/ExtrinsicSignature';
 import { QueueTx, QueueTx$MessageSetStatus, QueueTx$Result, QueueTx$Status, SignerCallback } from '@polkadot/ui-app/Status/types';
 
 import React from 'react';

yarn.lock

@@ -1462,31 +1462,31 @@
     universal-user-agent "^2.0.0"
     url-template "^2.0.8"
 
-"@polkadot/api-derive@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.42.15.tgz#df8dee04d0d59f966db5e906cbad5b23685a1ad0"
-  integrity sha512-c4YOgKR5ZOuUbh90+pFLEtc4Qf/MZtYRXyMGW9VzhrVvKcbv68dpumIDVEX1nPVgOswd9J1Q7mvPLHyi6BWqkA==
+"@polkadot/api-derive@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.42.18.tgz#4d98ed6061827f0df44e665dafa9ac63bbfec8bc"
+  integrity sha512-42oLDMm8lZzp/8OkTB/+0g2gq2ybdvwDNtyYbHlHu2GyhHIfMez9TRDMrmULbcpYWXx5Z+fTniTyO7/I9VsoLA==
   dependencies:
     "@babel/runtime" "^7.2.0"
-    "@polkadot/api" "^0.42.15"
-    "@polkadot/types" "^0.42.15"
+    "@polkadot/api" "^0.42.18"
+    "@polkadot/types" "^0.42.18"
     "@types/memoizee" "^0.4.2"
     "@types/rx" "^4.1.1"
     memoizee "^0.4.14"
     rxjs "^6.3.3"
 
-"@polkadot/api@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.42.15.tgz#d9089ff2b8da7876a705a6182c2425ea1a3b4e7c"
-  integrity sha512-6qSU89eiRE3OZyROwUwKoHk1YOlqwJ7gFUMbi6TQXhfahD00Ojl/MtqBWZTAzP29eamZBsfn8P/3ZJiwEVV46w==
+"@polkadot/api@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.42.18.tgz#3252cec459df1f78368388102930008c35dbe944"
+  integrity sha512-8gD7ggeyaxW9F0dNN5umj7TKeA8gxujhFUVagbR+OKZUbjO545+0L3ZNIx84L2L2fO/02qaB3eK8EqM92BNqOg==
   dependencies:
     "@babel/runtime" "^7.2.0"
-    "@polkadot/api-derive" "^0.42.15"
-    "@polkadot/extrinsics" "^0.42.15"
-    "@polkadot/rpc-provider" "^0.42.15"
-    "@polkadot/rpc-rx" "^0.42.15"
-    "@polkadot/storage" "^0.42.15"
-    "@polkadot/types" "^0.42.15"
+    "@polkadot/api-derive" "^0.42.18"
+    "@polkadot/extrinsics" "^0.42.18"
+    "@polkadot/rpc-provider" "^0.42.18"
+    "@polkadot/rpc-rx" "^0.42.18"
+    "@polkadot/storage" "^0.42.18"
+    "@polkadot/types" "^0.42.18"
     "@types/rx" "^4.1.1"
     rxjs "^6.3.3"
 
@@ -1566,19 +1566,19 @@
     typedoc-plugin-no-inherit "^1.1.2"
     typescript "^3.2.2"
 
-"@polkadot/extrinsics@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.42.15.tgz#dd76049e9ad5ee14f2527ebc393a52f6722248a0"
-  integrity sha512-KkBVKzI4MPS+7ClrWutWcqYbHaYTqA6bNK1FfyydeUHjiUx6YYb4cMUtm1BMfuGMAViBSKenU8I0w3XE1IZ9Uw==
+"@polkadot/extrinsics@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.42.18.tgz#a25b98984a6e59f13a7796320bda3e9fa8279cf6"
+  integrity sha512-VKiKjxriYpWAe6nUAvxvfU+7/uF2YLmrtUgtpuBSYkWNdUBUJwvkitbwfmcAD1qi060otfFzhyU5wKtaGx9pog==
   dependencies:
     "@babel/runtime" "^7.2.0"
-    "@polkadot/types" "^0.42.15"
+    "@polkadot/types" "^0.42.18"
     "@polkadot/util" "^0.33.36"
 
-"@polkadot/jsonrpc@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.42.15.tgz#1b233769fb4d7ea112c6f112a036d9351d09a41e"
-  integrity sha512-Pr4g+Lyv1ltpDsq0fZHlXbZcbQj6pklYhvrI6CRZmhR/Oof5vLYFRmqWMxAMUgE+bNTBJZhaOswWdGI12xshyQ==
+"@polkadot/jsonrpc@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.42.18.tgz#d116a06e58035dd63b210747cb061974ff9b2bd5"
+  integrity sha512-7VruCrrelxgh9vPkWZfB5PbvnNJLpyeXyE7OWg1T/cTYiCFvX70TO6NIIz5fyqJnEJEZeksSJuO3xYC2cFvhZQ==
   dependencies:
     "@babel/runtime" "^7.2.0"
 
@@ -1593,25 +1593,25 @@
     "@types/bs58" "^4.0.0"
     bs58 "^4.0.1"
 
-"@polkadot/rpc-core@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.42.15.tgz#672754da641bac19f1d3a81f123c644a0baadc15"
-  integrity sha512-AqM+idjAWScHFbbdcxfXiZRpxEJ33f9Goqkccp/MTisUvd4p7qqI2QnBZvjI3Pq5NT3jN8vVywClwEmoUkHDeA==
+"@polkadot/rpc-core@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.42.18.tgz#082a5ce6e2552c5d51fdfa855c704b08fc476120"
+  integrity sha512-e5UkdPDkeoEUxD+ZDn5NNRqgqPz3ml2h20u2U7q3pY3fwvrd7wSxJO6GjIETLGrafpZXn69JUD4YqzZag9JHKw==
   dependencies:
     "@babel/runtime" "^7.2.0"
-    "@polkadot/jsonrpc" "^0.42.15"
-    "@polkadot/rpc-provider" "^0.42.15"
-    "@polkadot/types" "^0.42.15"
+    "@polkadot/jsonrpc" "^0.42.18"
+    "@polkadot/rpc-provider" "^0.42.18"
+    "@polkadot/types" "^0.42.18"
     "@polkadot/util" "^0.33.36"
 
-"@polkadot/rpc-provider@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.42.15.tgz#850993ba70faf6f6cb7a5f89ff9c7ad4726590e0"
-  integrity sha512-VSxQYsze6eAU1wPS2LsFB3jnRnmo4dtdLJsre4dMseud1JmDtU3YUv/h+N2fb4aO6RitzBT1JZ4yK+ZOHKy+Og==
+"@polkadot/rpc-provider@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.42.18.tgz#8a88b91313efdc149b88ec3c9c7456cca88c7f0b"
+  integrity sha512-l+XwXA4+xgQTzRRGy4Mvnu1OYAg0WTU5+OtxYKSSBWXtX2WdLlkOroe5INR0Pk8xF/BIFnd4JryiGAFIrgWhLA==
   dependencies:
     "@babel/runtime" "^7.2.0"
     "@polkadot/keyring" "^0.33.36"
-    "@polkadot/storage" "^0.42.15"
+    "@polkadot/storage" "^0.42.18"
     "@polkadot/util" "^0.33.36"
     "@polkadot/util-crypto" "^0.33.36"
     "@types/nock" "^9.3.0"
@@ -1619,27 +1619,27 @@
     isomorphic-fetch "^2.2.1"
     websocket "^1.0.28"
 
-"@polkadot/rpc-rx@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/rpc-rx/-/rpc-rx-0.42.15.tgz#c1fc2666bec9ca12dc4674449bc4b938c55739b6"
-  integrity sha512-vTorH8H4LivF80L8uJoM4HhHu1GJapRgw7nTNGX1L0UsWqWRLMQDcqCFoV9innyGN4f7mcIPdniyQbk4/ICehQ==
+"@polkadot/rpc-rx@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/rpc-rx/-/rpc-rx-0.42.18.tgz#90679d3c2355316cd0480632e8a279c599dbec3c"
+  integrity sha512-/Psyvbbx1u/nHDUcH+zZjNmuHO7FjMy9jyaeJN5Pnawviu0MsIJCjgWWc7nQhsg64/hjhQ7qWaoF9KPdMhFLTg==
   dependencies:
     "@babel/runtime" "^7.2.0"
-    "@polkadot/rpc-core" "^0.42.15"
-    "@polkadot/rpc-provider" "^0.42.15"
+    "@polkadot/rpc-core" "^0.42.18"
+    "@polkadot/rpc-provider" "^0.42.18"
     "@types/memoizee" "^0.4.2"
     "@types/rx" "^4.1.1"
     memoizee "^0.4.14"
     rxjs "^6.3.3"
 
-"@polkadot/storage@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.42.15.tgz#9cbad308758787d5cf4afc3372500540abe8cd3e"
-  integrity sha512-40Hx6TwS6oTxRDHT9kDeGCDZKBdIjD3of63oxN0ZZ0/dm+Su+qT2q1ufLd8mg4TmAjZX8YXrPeQhyEzEYbvz8A==
+"@polkadot/storage@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.42.18.tgz#eff6b54707957c58d1733f313a73f5a95194d69f"
+  integrity sha512-2zTiBQqVxAUboQRdvHKftjqk5d2UDVfMsng98B3C/LR9rqIMRBbKHT4HMFRBWWa/9STGQ9AWh+KBLfAPJt6PXA==
   dependencies:
     "@babel/runtime" "^7.2.0"
     "@polkadot/keyring" "^0.33.36"
-    "@polkadot/types" "^0.42.15"
+    "@polkadot/types" "^0.42.18"
     "@polkadot/util" "^0.33.36"
     "@polkadot/util-crypto" "^0.33.36"
 
@@ -1648,10 +1648,10 @@
   resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.52.tgz#6fb09e494d244dad4b3a9ca581bfe13beec66565"
   integrity sha512-sij1O0x4CY51A394RYD4/aQwDPwIxIeTOpYI4AZgdF/vq5nvF14b4XFq9vAcSnblaIosf0sYKoz1f3dkN3QqLw==
 
-"@polkadot/types@^0.42.15":
-  version "0.42.15"
-  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.42.15.tgz#afda1451fe6dda9f24f3dde233374698f41c03ae"
-  integrity sha512-m2VMVDSV8Kqi9ApzQMLVhQUc/zbszYUabQgdECbPviX/EO5suqdNQpaz7A8tAfttuuRIlLCQ6HrZ419FyAKdLQ==
+"@polkadot/types@^0.42.18":
+  version "0.42.18"
+  resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.42.18.tgz#c12577eb5f0a0063a9af66cbca424aa2733f3e30"
+  integrity sha512-1i0G28KNK//oX9RLY1gwRFcimwF6ewYBnE4NnJgfY4UzSgGvSrdsviZx2Bp7hcE524rgTmX54xvKD+hK5iutHw==
   dependencies:
     "@babel/runtime" "^7.2.0"
     "@polkadot/keyring" "^0.33.36"