From 34888bd4fb1d27d1d4759490c8929fad976152ad Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 14 Mar 2019 09:02:55 +0100 Subject: [PATCH] Remove /index imports (swap to bare) (#773) * Remove /index imports (swap to bare) * Bump common --- .../api-derive/src/accounts/idAndIndex.ts | 2 +- packages/api-derive/src/accounts/idToIndex.ts | 2 +- packages/api-derive/src/accounts/indexToId.ts | 2 +- packages/api-derive/src/accounts/indexes.ts | 2 +- .../src/balances/validatingBalance.ts | 2 +- .../src/balances/validatingBalances.ts | 2 +- .../api-derive/src/balances/votingBalance.ts | 2 +- .../api-derive/src/balances/votingBalances.ts | 2 +- .../balances/votingBalancesNominatorsFor.ts | 2 +- packages/api-derive/src/chain/bestNumber.ts | 2 +- .../src/chain/bestNumberFinalised.ts | 2 +- .../api-derive/src/chain/bestNumberLag.ts | 2 +- packages/api-derive/src/chain/getHeader.ts | 2 +- .../api-derive/src/chain/subscribeNewHead.ts | 2 +- .../src/democracy/referendumInfo.ts | 2 +- .../src/democracy/referendumInfos.ts | 2 +- .../src/democracy/referendumVotesFor.ts | 2 +- .../api-derive/src/democracy/referendums.ts | 2 +- packages/api-derive/src/democracy/votes.ts | 2 +- packages/api-derive/src/index.spec.ts | 2 +- packages/api-derive/src/session/eraLength.ts | 2 +- .../api-derive/src/session/eraProgress.ts | 2 +- .../api-derive/src/session/sessionProgress.ts | 2 +- .../src/staking/intentionsBalances.ts | 2 +- packages/api-derive/src/types.ts | 2 +- packages/api-derive/test/e2e/derive.spec.ts | 4 +-- packages/api/package.json | 2 +- packages/api/src/Base.ts | 8 ++--- packages/api/src/SubmittableExtrinsic.ts | 2 +- packages/api/src/checkTypes.manual.ts | 4 +-- packages/api/src/index.ts | 2 +- packages/api/src/types.ts | 4 +-- packages/api/src/util/filterEvents.ts | 2 +- packages/api/test/util/SingleAccountSigner.ts | 2 +- packages/rpc-core/package.json | 2 +- packages/rpc-core/src/formatting.spec.ts | 2 +- packages/rpc-core/src/index.spec.ts | 2 +- packages/rpc-core/src/index.ts | 6 ++-- packages/rpc-core/src/methodSend.spec.ts | 2 +- packages/rpc-provider/package.json | 6 ++-- .../src/coder/decodeResponse.spec.ts | 2 +- .../rpc-provider/src/coder/encodeJson.spec.ts | 2 +- .../src/coder/encodeObject.spec.ts | 2 +- packages/rpc-provider/src/http/index.spec.js | 2 +- packages/rpc-provider/src/http/send.spec.js | 2 +- packages/rpc-provider/src/mock/index.ts | 4 +-- packages/rpc-provider/src/mock/on.spec.ts | 2 +- packages/rpc-provider/src/mock/send.spec.ts | 2 +- .../rpc-provider/src/mock/subscribe.spec.ts | 2 +- .../rpc-provider/src/mock/unsubscribe.spec.ts | 2 +- packages/rpc-provider/src/ws/connect.spec.js | 2 +- packages/rpc-provider/src/ws/index.spec.js | 2 +- .../src/ws/onMessageResult.spec.js | 2 +- .../src/ws/onMessageSubscribe.spec.js | 2 +- packages/rpc-provider/src/ws/onOpen.spec.js | 2 +- packages/rpc-provider/src/ws/send.spec.js | 2 +- packages/rpc-provider/src/ws/state.spec.js | 2 +- .../rpc-provider/src/ws/subscribe.spec.js | 2 +- .../rpc-provider/src/ws/unsubscribe.spec.js | 2 +- packages/rpc-rx/src/cached.spec.ts | 2 +- packages/rpc-rx/src/index.spec.ts | 2 +- packages/rpc-rx/src/index.ts | 2 +- packages/rpc-rx/src/replay.spec.ts | 2 +- packages/type-extrinsics/package.json | 2 +- .../type-extrinsics/src/fromMetadata.spec.ts | 2 +- packages/type-extrinsics/src/fromMetadata.ts | 2 +- packages/type-extrinsics/src/index.spec.ts | 2 +- packages/type-extrinsics/src/static.ts | 2 +- .../src/utils/createUnchecked.ts | 2 +- packages/type-jsonrpc/src/index.spec.js | 2 +- packages/type-storage/package.json | 6 ++-- .../type-storage/src/fromMetadata.spec.ts | 2 +- packages/type-storage/src/fromMetadata.ts | 2 +- packages/type-storage/src/static.ts | 2 +- packages/type-storage/src/substrate.ts | 2 +- .../type-storage/src/utils/createFunction.ts | 2 +- packages/types/package.json | 4 +-- packages/types/src/Metadata/v1/toV0.ts | 2 +- .../types/src/rpc/StorageChangeSet.spec.ts | 2 +- tsconfig.json | 9 ++++++ yarn.lock | 30 +++++++++---------- 81 files changed, 117 insertions(+), 108 deletions(-) diff --git a/packages/api-derive/src/accounts/idAndIndex.ts b/packages/api-derive/src/accounts/idAndIndex.ts index 9307533ce6..cbce7d654d 100644 --- a/packages/api-derive/src/accounts/idAndIndex.ts +++ b/packages/api-derive/src/accounts/idAndIndex.ts @@ -6,7 +6,7 @@ import { Observable, of } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; import { decodeAddress } from '@polkadot/keyring'; -import { AccountId, AccountIndex, Address } from '@polkadot/types/index'; +import { AccountId, AccountIndex, Address } from '@polkadot/types'; import { isU8a } from '@polkadot/util'; import { idToIndex } from './idToIndex'; diff --git a/packages/api-derive/src/accounts/idToIndex.ts b/packages/api-derive/src/accounts/idToIndex.ts index 542f492bca..7fd3a9fbd1 100644 --- a/packages/api-derive/src/accounts/idToIndex.ts +++ b/packages/api-derive/src/accounts/idToIndex.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, AccountIndex } from '@polkadot/types/index'; +import { AccountId, AccountIndex } from '@polkadot/types'; import { indexes, AccountIndexes } from './indexes'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/accounts/indexToId.ts b/packages/api-derive/src/accounts/indexToId.ts index 3f7a1f6597..a1ef886573 100644 --- a/packages/api-derive/src/accounts/indexToId.ts +++ b/packages/api-derive/src/accounts/indexToId.ts @@ -6,7 +6,7 @@ import { Observable } from 'rxjs'; import { map, startWith } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; import { ENUMSET_SIZE } from '@polkadot/types/type/AccountIndex'; -import { AccountId, AccountIndex, Vector } from '@polkadot/types/index'; +import { AccountId, AccountIndex, Vector } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/accounts/indexes.ts b/packages/api-derive/src/accounts/indexes.ts index f99351d30c..5f035faa90 100644 --- a/packages/api-derive/src/accounts/indexes.ts +++ b/packages/api-derive/src/accounts/indexes.ts @@ -6,7 +6,7 @@ import { combineLatest, Observable } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; import { ENUMSET_SIZE } from '@polkadot/types/type/AccountIndex'; -import { AccountId, AccountIndex } from '@polkadot/types/index'; +import { AccountId, AccountIndex } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/balances/validatingBalance.ts b/packages/api-derive/src/balances/validatingBalance.ts index cdaaf1b3f1..0c5b3be8ba 100644 --- a/packages/api-derive/src/balances/validatingBalance.ts +++ b/packages/api-derive/src/balances/validatingBalance.ts @@ -6,7 +6,7 @@ import BN from 'bn.js'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/index'; +import { AccountId, AccountIndex, Address, Balance } from '@polkadot/types'; import { DerivedBalances } from '../types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/balances/validatingBalances.ts b/packages/api-derive/src/balances/validatingBalances.ts index e2055cce5c..f08fa0d100 100644 --- a/packages/api-derive/src/balances/validatingBalances.ts +++ b/packages/api-derive/src/balances/validatingBalances.ts @@ -5,7 +5,7 @@ import { combineLatest, Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, Address } from '@polkadot/types/index'; +import { AccountId, Address } from '@polkadot/types'; import { DerivedBalancesMap } from '../types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/balances/votingBalance.ts b/packages/api-derive/src/balances/votingBalance.ts index f77b93e6c4..151fab029d 100644 --- a/packages/api-derive/src/balances/votingBalance.ts +++ b/packages/api-derive/src/balances/votingBalance.ts @@ -5,7 +5,7 @@ import { combineLatest, of, Observable } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, AccountIndex, Address, Balance } from '@polkadot/types/index'; +import { AccountId, AccountIndex, Address, Balance } from '@polkadot/types'; import { idAndIndex } from '../accounts/idAndIndex'; import { DerivedBalances } from '../types'; diff --git a/packages/api-derive/src/balances/votingBalances.ts b/packages/api-derive/src/balances/votingBalances.ts index 0c0919b67c..7c799646c3 100644 --- a/packages/api-derive/src/balances/votingBalances.ts +++ b/packages/api-derive/src/balances/votingBalances.ts @@ -4,7 +4,7 @@ import { combineLatest, Observable, of } from 'rxjs'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, AccountIndex, Address } from '@polkadot/types/index'; +import { AccountId, AccountIndex, Address } from '@polkadot/types'; import { DerivedBalances } from '../types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts b/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts index ae2230e6ae..d7d104b5ea 100644 --- a/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts +++ b/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts @@ -5,7 +5,7 @@ import { Observable, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, AccountIndex, Address, Vector } from '@polkadot/types/index'; +import { AccountId, AccountIndex, Address, Vector } from '@polkadot/types'; import { idAndIndex } from '../accounts/idAndIndex'; import { DerivedBalances } from '../types'; diff --git a/packages/api-derive/src/chain/bestNumber.ts b/packages/api-derive/src/chain/bestNumber.ts index eb87fdc378..3eb0375b61 100644 --- a/packages/api-derive/src/chain/bestNumber.ts +++ b/packages/api-derive/src/chain/bestNumber.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber, Header } from '@polkadot/types/index'; +import { BlockNumber, Header } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/chain/bestNumberFinalised.ts b/packages/api-derive/src/chain/bestNumberFinalised.ts index 2492cd7d95..5af7424997 100644 --- a/packages/api-derive/src/chain/bestNumberFinalised.ts +++ b/packages/api-derive/src/chain/bestNumberFinalised.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { filter, map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber, Header } from '@polkadot/types/index'; +import { BlockNumber, Header } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/chain/bestNumberLag.ts b/packages/api-derive/src/chain/bestNumberLag.ts index 8652112a81..25fdd96807 100644 --- a/packages/api-derive/src/chain/bestNumberLag.ts +++ b/packages/api-derive/src/chain/bestNumberLag.ts @@ -5,7 +5,7 @@ import { Observable, combineLatest } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber } from '@polkadot/types/index'; +import { BlockNumber } from '@polkadot/types'; import { drr } from '../util/drr'; import { bestNumber } from './bestNumber'; diff --git a/packages/api-derive/src/chain/getHeader.ts b/packages/api-derive/src/chain/getHeader.ts index f942d59817..d541c07042 100644 --- a/packages/api-derive/src/chain/getHeader.ts +++ b/packages/api-derive/src/chain/getHeader.ts @@ -5,7 +5,7 @@ import { Observable, combineLatest, of } from 'rxjs'; import { catchError, map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { Header, HeaderExtended } from '@polkadot/types/index'; +import { Header, HeaderExtended } from '@polkadot/types'; import { drr } from '../util/drr'; import { HeaderAndValidators } from './subscribeNewHead'; diff --git a/packages/api-derive/src/chain/subscribeNewHead.ts b/packages/api-derive/src/chain/subscribeNewHead.ts index a6cf4a34bb..5d70bed44b 100644 --- a/packages/api-derive/src/chain/subscribeNewHead.ts +++ b/packages/api-derive/src/chain/subscribeNewHead.ts @@ -5,7 +5,7 @@ import { Observable, combineLatest, of } from 'rxjs'; import { filter, map, switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, Header, HeaderExtended } from '@polkadot/types/index'; +import { AccountId, Header, HeaderExtended } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/democracy/referendumInfo.ts b/packages/api-derive/src/democracy/referendumInfo.ts index 9f65a829b5..393661a138 100644 --- a/packages/api-derive/src/democracy/referendumInfo.ts +++ b/packages/api-derive/src/democracy/referendumInfo.ts @@ -6,7 +6,7 @@ import BN from 'bn.js'; import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { Option, ReferendumInfo, ReferendumIndex } from '@polkadot/types/index'; +import { Option, ReferendumInfo, ReferendumIndex } from '@polkadot/types'; import { isNull } from '@polkadot/util'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/democracy/referendumInfos.ts b/packages/api-derive/src/democracy/referendumInfos.ts index 77ff146ffb..3238760ae7 100644 --- a/packages/api-derive/src/democracy/referendumInfos.ts +++ b/packages/api-derive/src/democracy/referendumInfos.ts @@ -5,7 +5,7 @@ import BN from 'bn.js'; import { combineLatest, Observable, of } from 'rxjs'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { Option } from '@polkadot/types/index'; +import { Option } from '@polkadot/types'; import { drr } from '../util/drr'; import { referendumInfo, ReferendumInfoExtended } from './referendumInfo'; diff --git a/packages/api-derive/src/democracy/referendumVotesFor.ts b/packages/api-derive/src/democracy/referendumVotesFor.ts index 83933c16f7..27fec0e2f1 100644 --- a/packages/api-derive/src/democracy/referendumVotesFor.ts +++ b/packages/api-derive/src/democracy/referendumVotesFor.ts @@ -6,7 +6,7 @@ import BN from 'bn.js'; import { combineLatest, Observable, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, Balance, Vector, Vote } from '@polkadot/types/index'; +import { AccountId, Balance, Vector, Vote } from '@polkadot/types'; import { DerivedReferendumVote } from '../types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/democracy/referendums.ts b/packages/api-derive/src/democracy/referendums.ts index d9f0f47a7c..72d7f72f40 100644 --- a/packages/api-derive/src/democracy/referendums.ts +++ b/packages/api-derive/src/democracy/referendums.ts @@ -5,7 +5,7 @@ import { combineLatest, Observable, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { Option, ReferendumIndex } from '@polkadot/types/index'; +import { Option, ReferendumIndex } from '@polkadot/types'; import { drr } from '../util/drr'; import { ReferendumInfoExtended } from './referendumInfo'; diff --git a/packages/api-derive/src/democracy/votes.ts b/packages/api-derive/src/democracy/votes.ts index d7a1099881..b6436b6e4c 100644 --- a/packages/api-derive/src/democracy/votes.ts +++ b/packages/api-derive/src/democracy/votes.ts @@ -5,7 +5,7 @@ import BN from 'bn.js'; import { combineLatest, Observable, of } from 'rxjs'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, Vote } from '@polkadot/types/index'; +import { AccountId, Vote } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/index.spec.ts b/packages/api-derive/src/index.spec.ts index b46892ae5b..ed1df43b74 100644 --- a/packages/api-derive/src/index.spec.ts +++ b/packages/api-derive/src/index.spec.ts @@ -7,7 +7,7 @@ import ApiRx from '@polkadot/api/rx/Api'; import { ApiInterface$Rx } from '@polkadot/api/types'; import MockProvider from '@polkadot/rpc-provider/mock'; -import { Derive } from './index'; +import { Derive } from '.'; const testFunction = (api: ApiInterface$Rx) => { return < diff --git a/packages/api-derive/src/session/eraLength.ts b/packages/api-derive/src/session/eraLength.ts index dfbbb272f6..ea09eb070d 100644 --- a/packages/api-derive/src/session/eraLength.ts +++ b/packages/api-derive/src/session/eraLength.ts @@ -6,7 +6,7 @@ import BN from 'bn.js'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber } from '@polkadot/types/index'; +import { BlockNumber } from '@polkadot/types'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/session/eraProgress.ts b/packages/api-derive/src/session/eraProgress.ts index 47ee24f06c..9f44095680 100644 --- a/packages/api-derive/src/session/eraProgress.ts +++ b/packages/api-derive/src/session/eraProgress.ts @@ -6,7 +6,7 @@ import BN from 'bn.js'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber } from '@polkadot/types/index'; +import { BlockNumber } from '@polkadot/types'; import { sessionProgress } from './sessionProgress'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/session/sessionProgress.ts b/packages/api-derive/src/session/sessionProgress.ts index f261a7ddc5..c265a87451 100644 --- a/packages/api-derive/src/session/sessionProgress.ts +++ b/packages/api-derive/src/session/sessionProgress.ts @@ -6,7 +6,7 @@ import BN from 'bn.js'; import { combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber, Option } from '@polkadot/types/index'; +import { BlockNumber, Option } from '@polkadot/types'; import { bestNumber } from '../chain'; import { drr } from '../util/drr'; diff --git a/packages/api-derive/src/staking/intentionsBalances.ts b/packages/api-derive/src/staking/intentionsBalances.ts index efde88fd85..76312de38a 100644 --- a/packages/api-derive/src/staking/intentionsBalances.ts +++ b/packages/api-derive/src/staking/intentionsBalances.ts @@ -5,7 +5,7 @@ import { Observable } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { AccountId, Vector } from '@polkadot/types/index'; +import { AccountId, Vector } from '@polkadot/types'; import { DerivedBalancesMap } from '../types'; import { validatingBalances } from '../balances'; diff --git a/packages/api-derive/src/types.ts b/packages/api-derive/src/types.ts index 51dbce18a0..e7b429d466 100644 --- a/packages/api-derive/src/types.ts +++ b/packages/api-derive/src/types.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import BN from 'bn.js'; -import { AccountId, Balance, Vote } from '@polkadot/types/index'; +import { AccountId, Balance, Vote } from '@polkadot/types'; export type DerivedBalances = { accountId: AccountId, diff --git a/packages/api-derive/test/e2e/derive.spec.ts b/packages/api-derive/test/e2e/derive.spec.ts index b31dd5f9d4..38bb6ac9b3 100644 --- a/packages/api-derive/test/e2e/derive.spec.ts +++ b/packages/api-derive/test/e2e/derive.spec.ts @@ -5,8 +5,8 @@ import BN from 'bn.js'; import ApiRx from '@polkadot/api/rx/Api'; import { ApiInterface$Rx } from '@polkadot/api/types'; -import { BlockNumber } from '@polkadot/types/index'; -import { WsProvider } from '@polkadot/rpc-provider/index'; +import { BlockNumber } from '@polkadot/types'; +import { WsProvider } from '@polkadot/rpc-provider'; const WS_LOCAL = 'ws://127.0.0.1:9944/'; // const WS_POC3 = 'wss://poc3-rpc.polkadot.io/'; diff --git a/packages/api/package.json b/packages/api/package.json index 3ea456820e..e5306ba9c5 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -36,6 +36,6 @@ "@polkadot/rpc-rx": "^0.46.11", "@polkadot/storage": "^0.46.11", "@polkadot/types": "^0.46.11", - "@polkadot/util-crypto": "^0.36.1" + "@polkadot/util-crypto": "^0.36.3" } } diff --git a/packages/api/src/Base.ts b/packages/api/src/Base.ts index 67be73b7f3..ce04ff8d44 100644 --- a/packages/api/src/Base.ts +++ b/packages/api/src/Base.ts @@ -18,12 +18,12 @@ import { import EventEmitter from 'eventemitter3'; import { map } from 'rxjs/operators'; -import decorateDerive, { Derive as DeriveInterface } from '@polkadot/api-derive/index'; +import decorateDerive, { Derive as DeriveInterface } from '@polkadot/api-derive'; import extrinsicsFromMeta from '@polkadot/extrinsics/fromMetadata'; -import RpcBase from '@polkadot/rpc-core/index'; -import RpcRx from '@polkadot/rpc-rx/index'; +import RpcBase from '@polkadot/rpc-core'; +import RpcRx from '@polkadot/rpc-rx'; import storageFromMeta from '@polkadot/storage/fromMetadata'; -import { Event, getTypeRegistry, Hash, Metadata, Method, RuntimeVersion } from '@polkadot/types/index'; +import { Event, getTypeRegistry, Hash, Metadata, Method, RuntimeVersion } from '@polkadot/types'; import { MethodFunction, ModulesWithMethods } from '@polkadot/types/primitive/Method'; import { StorageFunction } from '@polkadot/types/primitive/StorageKey'; import { assert, compactStripLength, isFunction, isObject, isUndefined, logger, u8aToHex } from '@polkadot/util'; diff --git a/packages/api/src/SubmittableExtrinsic.ts b/packages/api/src/SubmittableExtrinsic.ts index b00ffb5e05..897579ed14 100644 --- a/packages/api/src/SubmittableExtrinsic.ts +++ b/packages/api/src/SubmittableExtrinsic.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { KeyringPair } from '@polkadot/keyring/types'; -import { AccountId, Address, ExtrinsicStatus, EventRecord, getTypeRegistry, Hash, Index, Method, SignedBlock, Struct, Text, Vector } from '@polkadot/types/index'; +import { AccountId, Address, ExtrinsicStatus, EventRecord, getTypeRegistry, Hash, Index, Method, SignedBlock, Struct, Text, Vector } from '@polkadot/types'; import { Codec, CodecCallback, IExtrinsic, SignatureOptions } from '@polkadot/types/types'; import { ApiInterface$Rx, ApiType, OnCallDefinition, Signer } from './types'; diff --git a/packages/api/src/checkTypes.manual.ts b/packages/api/src/checkTypes.manual.ts index a0a61e3c2f..ab98dbd2e6 100644 --- a/packages/api/src/checkTypes.manual.ts +++ b/packages/api/src/checkTypes.manual.ts @@ -4,10 +4,10 @@ // Simple non-runnable checks to test type definitions in the editor itself -import { ApiPromise } from '@polkadot/api/index'; +import { ApiPromise } from '@polkadot/api'; import testKeyring from '@polkadot/keyring/testingPairs'; import { IExtrinsic, IMethod } from '@polkadot/types/types'; -import { Header, HeaderExtended } from '@polkadot/types/index'; +import { Header, HeaderExtended } from '@polkadot/types'; export default async function test () { const api = await ApiPromise.create(); diff --git a/packages/api/src/index.ts b/packages/api/src/index.ts index 461061cb68..09e8451e43 100644 --- a/packages/api/src/index.ts +++ b/packages/api/src/index.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. -export { WsProvider } from '@polkadot/rpc-provider/index'; +export { WsProvider } from '@polkadot/rpc-provider'; export { default as ApiPromise } from './promise'; export { default as ApiRx } from './rx'; diff --git a/packages/api/src/types.ts b/packages/api/src/types.ts index 6ec6b74982..e84e8343e4 100644 --- a/packages/api/src/types.ts +++ b/packages/api/src/types.ts @@ -3,10 +3,10 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { Observable } from 'rxjs'; -import { DeriveCustom } from '@polkadot/api-derive/index'; +import { DeriveCustom } from '@polkadot/api-derive'; import { ProviderInterface } from '@polkadot/rpc-provider/types'; import { RpcRxInterface$Events } from '@polkadot/rpc-rx/types'; -import { Hash, Metadata, RuntimeVersion, u64 as U64 } from '@polkadot/types/index'; +import { Hash, Metadata, RuntimeVersion, u64 as U64 } from '@polkadot/types'; import { CodecArg, CodecCallback, diff --git a/packages/api/src/util/filterEvents.ts b/packages/api/src/util/filterEvents.ts index c323c7f549..03aae865c8 100644 --- a/packages/api/src/util/filterEvents.ts +++ b/packages/api/src/util/filterEvents.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 { EventRecord, SignedBlock, U8a } from '@polkadot/types/index'; +import { EventRecord, SignedBlock, U8a } from '@polkadot/types'; import l from './logging'; diff --git a/packages/api/test/util/SingleAccountSigner.ts b/packages/api/test/util/SingleAccountSigner.ts index b2d79c16b6..df6f8a1034 100644 --- a/packages/api/test/util/SingleAccountSigner.ts +++ b/packages/api/test/util/SingleAccountSigner.ts @@ -5,7 +5,7 @@ import { KeyringPair } from '@polkadot/keyring/types'; import { SignatureOptions } from '@polkadot/types/types'; -import { Extrinsic } from '@polkadot/types/index'; +import { Extrinsic } from '@polkadot/types'; let id = 0; diff --git a/packages/rpc-core/package.json b/packages/rpc-core/package.json index 01bfb606c6..7fbab345f2 100644 --- a/packages/rpc-core/package.json +++ b/packages/rpc-core/package.json @@ -33,6 +33,6 @@ "@polkadot/jsonrpc": "^0.46.11", "@polkadot/rpc-provider": "^0.46.11", "@polkadot/types": "^0.46.11", - "@polkadot/util": "^0.36.1" + "@polkadot/util": "^0.36.3" } } diff --git a/packages/rpc-core/src/formatting.spec.ts b/packages/rpc-core/src/formatting.spec.ts index 4428a8d082..49deefed69 100644 --- a/packages/rpc-core/src/formatting.spec.ts +++ b/packages/rpc-core/src/formatting.spec.ts @@ -5,7 +5,7 @@ import BN from 'bn.js'; import storage from '@polkadot/storage/static'; -import Api from './index'; +import Api from '.'; const ADDR_ONE = '5EhmTa7fL6SdjgKXo9g6hetR6nHnRAmrtisoGFWEESjzECtY'; const ADDR_TWO = '5FjbQAHSptRU4Q7Py6zDsRnE7UkpZikJVg5nm1tmu3WuZXKd'; diff --git a/packages/rpc-core/src/index.spec.ts b/packages/rpc-core/src/index.spec.ts index b7b8716a79..60e8dcad22 100644 --- a/packages/rpc-core/src/index.spec.ts +++ b/packages/rpc-core/src/index.spec.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 Api from './index'; +import Api from '.'; describe('Api', () => { let api: Api; diff --git a/packages/rpc-core/src/index.ts b/packages/rpc-core/src/index.ts index 54cda37abb..02c5624e42 100644 --- a/packages/rpc-core/src/index.ts +++ b/packages/rpc-core/src/index.ts @@ -6,10 +6,10 @@ import { ProviderInterface, ProviderInterface$Callback } from '@polkadot/rpc-pro import { RpcSection, RpcMethod } from '@polkadot/jsonrpc/types'; import { RpcInterface, RpcInterface$Method, RpcInterface$Section } from './types'; -import interfaces from '@polkadot/jsonrpc/index'; -import { WsProvider } from '@polkadot/rpc-provider/index'; +import interfaces from '@polkadot/jsonrpc'; +import { WsProvider } from '@polkadot/rpc-provider'; import { Codec } from '@polkadot/types/types'; -import { Option, StorageChangeSet, StorageKey, Vector, createClass, createType } from '@polkadot/types/index'; +import { Option, StorageChangeSet, StorageKey, Vector, createClass, createType } from '@polkadot/types'; import { ExtError, assert, isFunction, isNull, logger } from '@polkadot/util'; const l = logger('rpc-core'); diff --git a/packages/rpc-core/src/methodSend.spec.ts b/packages/rpc-core/src/methodSend.spec.ts index af2a29c857..a7daaa707c 100644 --- a/packages/rpc-core/src/methodSend.spec.ts +++ b/packages/rpc-core/src/methodSend.spec.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 Api from './index'; +import Api from '.'; describe('methodSend', () => { let api: Api; diff --git a/packages/rpc-provider/package.json b/packages/rpc-provider/package.json index 97d3446073..61140d0efd 100644 --- a/packages/rpc-provider/package.json +++ b/packages/rpc-provider/package.json @@ -30,10 +30,10 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/rpc-provider#readme", "dependencies": { "@babel/runtime": "^7.3.4", - "@polkadot/keyring": "^0.36.1", + "@polkadot/keyring": "^0.36.3", "@polkadot/storage": "^0.46.11", - "@polkadot/util": "^0.36.1", - "@polkadot/util-crypto": "^0.36.1", + "@polkadot/util": "^0.36.3", + "@polkadot/util-crypto": "^0.36.3", "@types/nock": "^9.3.1", "eventemitter3": "^3.1.0", "isomorphic-fetch": "^2.2.1", diff --git a/packages/rpc-provider/src/coder/decodeResponse.spec.ts b/packages/rpc-provider/src/coder/decodeResponse.spec.ts index 6de4c5390c..0a6cce4570 100644 --- a/packages/rpc-provider/src/coder/decodeResponse.spec.ts +++ b/packages/rpc-provider/src/coder/decodeResponse.spec.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { JsonRpcResponse } from '../types'; -import Coder from './index'; +import Coder from '.'; describe('decodeResponse', () => { let coder: Coder; diff --git a/packages/rpc-provider/src/coder/encodeJson.spec.ts b/packages/rpc-provider/src/coder/encodeJson.spec.ts index da378f5d91..b006fc77d4 100644 --- a/packages/rpc-provider/src/coder/encodeJson.spec.ts +++ b/packages/rpc-provider/src/coder/encodeJson.spec.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 Coder from './index'; +import Coder from '.'; describe('encodeJson', () => { let coder: Coder; diff --git a/packages/rpc-provider/src/coder/encodeObject.spec.ts b/packages/rpc-provider/src/coder/encodeObject.spec.ts index cc78114897..8923071cb7 100644 --- a/packages/rpc-provider/src/coder/encodeObject.spec.ts +++ b/packages/rpc-provider/src/coder/encodeObject.spec.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 Coder from './index'; +import Coder from '.'; describe('encodeObject', () => { let coder: Coder; diff --git a/packages/rpc-provider/src/http/index.spec.js b/packages/rpc-provider/src/http/index.spec.js index a6a6c971e5..2ce7c922c7 100644 --- a/packages/rpc-provider/src/http/index.spec.js +++ b/packages/rpc-provider/src/http/index.spec.js @@ -4,7 +4,7 @@ import { TEST_HTTP_URL } from '../../test/mockHttp'; -import Http from './index'; +import Http from '.'; describe('Http', () => { let http; diff --git a/packages/rpc-provider/src/http/send.spec.js b/packages/rpc-provider/src/http/send.spec.js index 7563113854..eb3424a933 100644 --- a/packages/rpc-provider/src/http/send.spec.js +++ b/packages/rpc-provider/src/http/send.spec.js @@ -4,7 +4,7 @@ import { mockHttp, TEST_HTTP_URL } from '../../test/mockHttp'; -import Http from './index'; +import Http from '.'; describe('send', () => { let http; diff --git a/packages/rpc-provider/src/mock/index.ts b/packages/rpc-provider/src/mock/index.ts index a4e9951b00..dc3e48bff3 100644 --- a/packages/rpc-provider/src/mock/index.ts +++ b/packages/rpc-provider/src/mock/index.ts @@ -7,12 +7,12 @@ import { MockState$Subscriptions, MockState$Subscription$Callback, MockState$Db import BN from 'bn.js'; import EventEmitter from 'eventemitter3'; -import interfaces from '@polkadot/jsonrpc/index'; +import interfaces from '@polkadot/jsonrpc'; import testKeyring from '@polkadot/keyring/testing'; import storage from '@polkadot/storage/static'; import { Codec } from '@polkadot/types/types'; import metadata from '@polkadot/types/Metadata/v0/static'; -import { Header } from '@polkadot/types/index'; +import { Header } from '@polkadot/types'; import { bnToU8a, logger, u8aToHex } from '@polkadot/util'; import { randomAsU8a } from '@polkadot/util-crypto'; diff --git a/packages/rpc-provider/src/mock/on.spec.ts b/packages/rpc-provider/src/mock/on.spec.ts index 397f15bbbb..f5143d2511 100644 --- a/packages/rpc-provider/src/mock/on.spec.ts +++ b/packages/rpc-provider/src/mock/on.spec.ts @@ -4,7 +4,7 @@ import { ProviderInterface$Emitted } from '../types'; -import Mock from './index'; +import Mock from '.'; describe('on', () => { let mock: Mock; diff --git a/packages/rpc-provider/src/mock/send.spec.ts b/packages/rpc-provider/src/mock/send.spec.ts index d2dcf078eb..c684d18168 100644 --- a/packages/rpc-provider/src/mock/send.spec.ts +++ b/packages/rpc-provider/src/mock/send.spec.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 Mock from './index'; +import Mock from '.'; describe('send', () => { let mock: Mock; diff --git a/packages/rpc-provider/src/mock/subscribe.spec.ts b/packages/rpc-provider/src/mock/subscribe.spec.ts index 64fd1cb49b..3d298abbcc 100644 --- a/packages/rpc-provider/src/mock/subscribe.spec.ts +++ b/packages/rpc-provider/src/mock/subscribe.spec.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 Mock from './index'; +import Mock from '.'; describe('subscribe', () => { let mock: Mock; diff --git a/packages/rpc-provider/src/mock/unsubscribe.spec.ts b/packages/rpc-provider/src/mock/unsubscribe.spec.ts index 38a90ac633..cdceda9db0 100644 --- a/packages/rpc-provider/src/mock/unsubscribe.spec.ts +++ b/packages/rpc-provider/src/mock/unsubscribe.spec.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 Mock from './index'; +import Mock from '.'; describe('unsubscribe', () => { let mock: Mock; diff --git a/packages/rpc-provider/src/ws/connect.spec.js b/packages/rpc-provider/src/ws/connect.spec.js index 04b32faab8..6a6f0aff9f 100644 --- a/packages/rpc-provider/src/ws/connect.spec.js +++ b/packages/rpc-provider/src/ws/connect.spec.js @@ -4,7 +4,7 @@ import { mockWs, TEST_WS_URL } from '../../test/mockWs'; -import Ws from './index'; +import Ws from '.'; describe('onConnect', () => { let mock; diff --git a/packages/rpc-provider/src/ws/index.spec.js b/packages/rpc-provider/src/ws/index.spec.js index 1080fd434d..480ca11a2e 100644 --- a/packages/rpc-provider/src/ws/index.spec.js +++ b/packages/rpc-provider/src/ws/index.spec.js @@ -4,7 +4,7 @@ import { mockWs, TEST_WS_URL } from '../../test/mockWs'; -import Ws from './index'; +import Ws from '.'; let ws; let mock; diff --git a/packages/rpc-provider/src/ws/onMessageResult.spec.js b/packages/rpc-provider/src/ws/onMessageResult.spec.js index 3bc7296ced..e3b5a09d12 100644 --- a/packages/rpc-provider/src/ws/onMessageResult.spec.js +++ b/packages/rpc-provider/src/ws/onMessageResult.spec.js @@ -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 Ws from './index'; +import Ws from '.'; describe('onMessageResult', () => { let ws; diff --git a/packages/rpc-provider/src/ws/onMessageSubscribe.spec.js b/packages/rpc-provider/src/ws/onMessageSubscribe.spec.js index 9ec3c23b35..0f139b1d02 100644 --- a/packages/rpc-provider/src/ws/onMessageSubscribe.spec.js +++ b/packages/rpc-provider/src/ws/onMessageSubscribe.spec.js @@ -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 Ws from './index'; +import Ws from '.'; describe('onMessageSubscribe', () => { let ws; diff --git a/packages/rpc-provider/src/ws/onOpen.spec.js b/packages/rpc-provider/src/ws/onOpen.spec.js index 32a62570dc..4615711443 100644 --- a/packages/rpc-provider/src/ws/onOpen.spec.js +++ b/packages/rpc-provider/src/ws/onOpen.spec.js @@ -4,7 +4,7 @@ import { mockWs, TEST_WS_URL } from '../../test/mockWs'; -import Ws from './index'; +import Ws from '.'; let ws; let mock; diff --git a/packages/rpc-provider/src/ws/send.spec.js b/packages/rpc-provider/src/ws/send.spec.js index 7bd527d00f..906c71d53c 100644 --- a/packages/rpc-provider/src/ws/send.spec.js +++ b/packages/rpc-provider/src/ws/send.spec.js @@ -4,7 +4,7 @@ import { mockWs, TEST_WS_URL } from '../../test/mockWs'; -import Ws from './index'; +import Ws from '.'; let ws; let mock; diff --git a/packages/rpc-provider/src/ws/state.spec.js b/packages/rpc-provider/src/ws/state.spec.js index e04ac5960f..b47418acc4 100644 --- a/packages/rpc-provider/src/ws/state.spec.js +++ b/packages/rpc-provider/src/ws/state.spec.js @@ -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 Ws from './index'; +import Ws from '.'; describe('state', () => { it('requires an ws:// prefixed endpoint', () => { diff --git a/packages/rpc-provider/src/ws/subscribe.spec.js b/packages/rpc-provider/src/ws/subscribe.spec.js index 3d56a2b4cd..02ba4fb97e 100644 --- a/packages/rpc-provider/src/ws/subscribe.spec.js +++ b/packages/rpc-provider/src/ws/subscribe.spec.js @@ -4,7 +4,7 @@ import { mockWs, TEST_WS_URL } from '../../test/mockWs'; -import Ws from './index'; +import Ws from '.'; let ws; let mock; diff --git a/packages/rpc-provider/src/ws/unsubscribe.spec.js b/packages/rpc-provider/src/ws/unsubscribe.spec.js index c5101772b6..e307beeea2 100644 --- a/packages/rpc-provider/src/ws/unsubscribe.spec.js +++ b/packages/rpc-provider/src/ws/unsubscribe.spec.js @@ -4,7 +4,7 @@ import { mockWs, TEST_WS_URL } from '../../test/mockWs'; -import Ws from './index'; +import Ws from '.'; let ws; let mock; diff --git a/packages/rpc-rx/src/cached.spec.ts b/packages/rpc-rx/src/cached.spec.ts index 19296b0b79..cca6042326 100644 --- a/packages/rpc-rx/src/cached.spec.ts +++ b/packages/rpc-rx/src/cached.spec.ts @@ -11,7 +11,7 @@ jest.mock('@polkadot/rpc-provider/ws', () => class { send = () => true; }); -import RpcRx from './index'; +import RpcRx from '.'; describe('createCachedObservable', () => { let api: RpcRx; diff --git a/packages/rpc-rx/src/index.spec.ts b/packages/rpc-rx/src/index.spec.ts index c7e3a58762..cc632d86ec 100644 --- a/packages/rpc-rx/src/index.spec.ts +++ b/packages/rpc-rx/src/index.spec.ts @@ -10,7 +10,7 @@ jest.mock('@polkadot/rpc-provider/ws', () => class { send = () => true; }); -import RpcRx from './index'; +import RpcRx from '.'; describe('RpcRx', () => { let api: RpcRx; diff --git a/packages/rpc-rx/src/index.ts b/packages/rpc-rx/src/index.ts index 2066bdbcaf..bdb99fc6fd 100644 --- a/packages/rpc-rx/src/index.ts +++ b/packages/rpc-rx/src/index.ts @@ -9,7 +9,7 @@ import { RpcRxInterface, RpcRxInterface$Events, RpcRxInterface$Method, RpcRxInte import EventEmitter from 'eventemitter3'; import memoize, { Memoized } from 'memoizee'; import { BehaviorSubject, Observable, from, Observer } from 'rxjs'; -import Rpc from '@polkadot/rpc-core/index'; +import Rpc from '@polkadot/rpc-core'; import { map, publishReplay, refCount } from 'rxjs/operators'; import { isFunction, isUndefined } from '@polkadot/util'; diff --git a/packages/rpc-rx/src/replay.spec.ts b/packages/rpc-rx/src/replay.spec.ts index 717b441e6d..6b74e32ab0 100644 --- a/packages/rpc-rx/src/replay.spec.ts +++ b/packages/rpc-rx/src/replay.spec.ts @@ -11,7 +11,7 @@ jest.mock('@polkadot/rpc-provider/ws', () => class { send = () => true; }); -import RpcRx from './index'; +import RpcRx from '.'; describe('replay', () => { const params = [123, false]; diff --git a/packages/type-extrinsics/package.json b/packages/type-extrinsics/package.json index 4b58ce4935..3d796907e7 100644 --- a/packages/type-extrinsics/package.json +++ b/packages/type-extrinsics/package.json @@ -12,6 +12,6 @@ "dependencies": { "@babel/runtime": "^7.3.4", "@polkadot/types": "^0.46.11", - "@polkadot/util": "^0.36.1" + "@polkadot/util": "^0.36.3" } } diff --git a/packages/type-extrinsics/src/fromMetadata.spec.ts b/packages/type-extrinsics/src/fromMetadata.spec.ts index 5e5bee3c4b..b7f324ef3f 100644 --- a/packages/type-extrinsics/src/fromMetadata.spec.ts +++ b/packages/type-extrinsics/src/fromMetadata.spec.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 { Extrinsic, Metadata } from '@polkadot/types/index'; +import { Extrinsic, Metadata } from '@polkadot/types'; import json from '@polkadot/types/Metadata/v0/static'; import fromMetadata from './fromMetadata'; diff --git a/packages/type-extrinsics/src/fromMetadata.ts b/packages/type-extrinsics/src/fromMetadata.ts index 3a9cc69527..b334eadcbd 100644 --- a/packages/type-extrinsics/src/fromMetadata.ts +++ b/packages/type-extrinsics/src/fromMetadata.ts @@ -9,7 +9,7 @@ import MetadataV0 from '@polkadot/types/Metadata/v0'; import { stringCamelCase } from '@polkadot/util'; import createUnchecked from './utils/createUnchecked'; -import extrinsics from './index'; +import extrinsics from '.'; /** * Extend a storage object with the storage modules & module functions present diff --git a/packages/type-extrinsics/src/index.spec.ts b/packages/type-extrinsics/src/index.spec.ts index 13ed1347a2..b491446be6 100644 --- a/packages/type-extrinsics/src/index.spec.ts +++ b/packages/type-extrinsics/src/index.spec.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import testingPairs from '@polkadot/keyring/testingPairs'; -import { Extrinsic } from '@polkadot/types/index'; +import { Extrinsic } from '@polkadot/types'; import extrinsics from './static'; diff --git a/packages/type-extrinsics/src/static.ts b/packages/type-extrinsics/src/static.ts index e1dc049e86..8417b2d325 100644 --- a/packages/type-extrinsics/src/static.ts +++ b/packages/type-extrinsics/src/static.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 { Metadata } from '@polkadot/types/index'; +import { Metadata } from '@polkadot/types'; import metadataRpc from '@polkadot/types/Metadata/v0/static'; import { ModulesWithMethods } from '@polkadot/types/primitive/Method'; diff --git a/packages/type-extrinsics/src/utils/createUnchecked.ts b/packages/type-extrinsics/src/utils/createUnchecked.ts index f2b5a0020b..3235c0d5ef 100644 --- a/packages/type-extrinsics/src/utils/createUnchecked.ts +++ b/packages/type-extrinsics/src/utils/createUnchecked.ts @@ -4,7 +4,7 @@ import { FunctionMetadata } from '@polkadot/types/Metadata/v0/Modules'; import { MethodFunction } from '@polkadot/types/primitive/Method'; -import { Method } from '@polkadot/types/index'; +import { Method } from '@polkadot/types'; import { assert } from '@polkadot/util'; /** diff --git a/packages/type-jsonrpc/src/index.spec.js b/packages/type-jsonrpc/src/index.spec.js index 8cfc84512a..3a0e22ad77 100644 --- a/packages/type-jsonrpc/src/index.spec.js +++ b/packages/type-jsonrpc/src/index.spec.js @@ -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 interfaces from './index'; +import interfaces from '.'; describe('jsonrpc', () => { it('exports the available interfaces', () => { diff --git a/packages/type-storage/package.json b/packages/type-storage/package.json index fead5ba1ab..74c4f82215 100644 --- a/packages/type-storage/package.json +++ b/packages/type-storage/package.json @@ -30,9 +30,9 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/type-storage#readme", "dependencies": { "@babel/runtime": "^7.3.4", - "@polkadot/keyring": "^0.36.1", + "@polkadot/keyring": "^0.36.3", "@polkadot/types": "^0.46.11", - "@polkadot/util": "^0.36.1", - "@polkadot/util-crypto": "^0.36.1" + "@polkadot/util": "^0.36.3", + "@polkadot/util-crypto": "^0.36.3" } } diff --git a/packages/type-storage/src/fromMetadata.spec.ts b/packages/type-storage/src/fromMetadata.spec.ts index 67130bb622..2614d4d201 100644 --- a/packages/type-storage/src/fromMetadata.spec.ts +++ b/packages/type-storage/src/fromMetadata.spec.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 { Metadata } from '@polkadot/types/index'; +import { Metadata } from '@polkadot/types'; import json from '@polkadot/types/Metadata/v0/static'; import fromMetadata from './fromMetadata'; diff --git a/packages/type-storage/src/fromMetadata.ts b/packages/type-storage/src/fromMetadata.ts index c6019a98e1..e9ef804021 100644 --- a/packages/type-storage/src/fromMetadata.ts +++ b/packages/type-storage/src/fromMetadata.ts @@ -8,7 +8,7 @@ import MetadataV0 from '@polkadot/types/Metadata/v0'; import { stringLowerFirst } from '@polkadot/util'; import createFunction from './utils/createFunction'; -import storage from './index'; +import storage from '.'; /** * Extend a storage object with the storage modules & module functions present diff --git a/packages/type-storage/src/static.ts b/packages/type-storage/src/static.ts index c83e302302..fff16fe7ac 100644 --- a/packages/type-storage/src/static.ts +++ b/packages/type-storage/src/static.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 { Metadata } from '@polkadot/types/index'; +import { Metadata } from '@polkadot/types'; import metadataRpc from '@polkadot/types/Metadata/v0/static'; import fromMetadata from './fromMetadata'; diff --git a/packages/type-storage/src/substrate.ts b/packages/type-storage/src/substrate.ts index 1ef48d9796..0001df8a61 100644 --- a/packages/type-storage/src/substrate.ts +++ b/packages/type-storage/src/substrate.ts @@ -4,7 +4,7 @@ import { StorageFunctionMetadata, StorageFunctionModifier, StorageFunctionType } from '@polkadot/types/Metadata/v0/Modules'; import { StorageFunction } from '@polkadot/types/primitive/StorageKey'; -import { Text, Vector } from '@polkadot/types/index'; +import { Text, Vector } from '@polkadot/types'; import createFunction from './utils/createFunction'; diff --git a/packages/type-storage/src/utils/createFunction.ts b/packages/type-storage/src/utils/createFunction.ts index 01916c3436..c016d24b42 100644 --- a/packages/type-storage/src/utils/createFunction.ts +++ b/packages/type-storage/src/utils/createFunction.ts @@ -4,7 +4,7 @@ import { StorageFunctionMetadata } from '@polkadot/types/Metadata/v0/Modules'; import { StorageFunction } from '@polkadot/types/primitive/StorageKey'; -import { Compact, Text, createType } from '@polkadot/types/index'; +import { Compact, Text, createType } from '@polkadot/types'; import { assert, isNull, isUndefined, stringLowerFirst, stringToU8a, u8aConcat } from '@polkadot/util'; import { xxhashAsU8a } from '@polkadot/util-crypto'; diff --git a/packages/types/package.json b/packages/types/package.json index 871179de2e..187dcf70f1 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -30,8 +30,8 @@ "homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme", "dependencies": { "@babel/runtime": "^7.3.4", - "@polkadot/keyring": "^0.36.1", - "@polkadot/util": "^0.36.1", + "@polkadot/keyring": "^0.36.3", + "@polkadot/util": "^0.36.3", "core-js": "^2.6.5" } } diff --git a/packages/types/src/Metadata/v1/toV0.ts b/packages/types/src/Metadata/v1/toV0.ts index 3669c0dbbb..2b6211acc9 100644 --- a/packages/types/src/Metadata/v1/toV0.ts +++ b/packages/types/src/Metadata/v1/toV0.ts @@ -7,7 +7,7 @@ import { EventMetadata, OuterEventMetadata, OuterEventMetadataEvent } from '../v import { CallMetadata, FunctionMetadata, RuntimeModuleMetadata, ModuleMetadata, StorageFunctionMetadata, StorageMetadata } from '../v0/Modules'; import MetadataV0 from '../v0/Metadata'; -import MetadataV1, { MetadataModuleV1 } from './index'; +import MetadataV1, { MetadataModuleV1 } from '.'; function storageV0 (mod: MetadataModuleV1): StorageMetadata | null { if (mod.storage.isNone) { diff --git a/packages/types/src/rpc/StorageChangeSet.spec.ts b/packages/types/src/rpc/StorageChangeSet.spec.ts index 858503db65..fce674afc5 100644 --- a/packages/types/src/rpc/StorageChangeSet.spec.ts +++ b/packages/types/src/rpc/StorageChangeSet.spec.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 { createType } from '@polkadot/types/index'; +import { createType } from '@polkadot/types'; import json from '../json/StorageChangeSet.001.json'; import StorageChangeSet from './StorageChangeSet'; diff --git a/tsconfig.json b/tsconfig.json index 0e6695a420..92edb5ea3c 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,14 +5,23 @@ "baseUrl": ".", "paths": { + "@polkadot/api": ["packages/api/src"], "@polkadot/api/*": ["packages/api/src/*"], + "@polkadot/api-derive": ["packages/api-derive/src"], "@polkadot/api-derive/*": ["packages/api-derive/src/*"], + "@polkadot/rpc-core": ["packages/rpc-core/src"], "@polkadot/rpc-core/*": ["packages/rpc-core/src/*"], + "@polkadot/rpc-provider": ["packages/rpc-provider/src"], "@polkadot/rpc-provider/*": ["packages/rpc-provider/src/*"], + "@polkadot/rpc-rx": ["packages/rpc-rx/src"], "@polkadot/rpc-rx/*": ["packages/rpc-rx/src/*"], + "@polkadot/extrinsics": ["packages/type-extrinsics/src"], "@polkadot/extrinsics/*": ["packages/type-extrinsics/src/*"], + "@polkadot/jsonrpc": ["packages/type-jsonrpc/src"], "@polkadot/jsonrpc/*": ["packages/type-jsonrpc/src/*"], + "@polkadot/storage": ["packages/type-storage/src"], "@polkadot/storage/*": ["packages/type-storage/src/*"], + "@polkadot/types": ["packages/types/src"], "@polkadot/types/*": ["packages/types/src/*"] }, "typeRoots": [ diff --git a/yarn.lock b/yarn.lock index a45692607f..47b8a6a8a2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1429,14 +1429,14 @@ typescript "^3.3.3333" vuepress "^1.0.0-alpha.40" -"@polkadot/keyring@^0.36.1": - version "0.36.1" - resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.36.1.tgz#c34b4c8132e96e80a374b906c7190f39c92e5eb5" - integrity sha512-LTEPA2IGjr6v0Q4UdWb8vhVCJMV1Iy9++vKFNm/MVjedwYAtcaHa2UqmjgejJhndHf1DJLKZvQYFHmPUUDI4jQ== +"@polkadot/keyring@^0.36.3": + version "0.36.3" + resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-0.36.3.tgz#4114f17f71137daee6f8f21ec22642a30d54360f" + integrity sha512-1k/NHaEJpIAyUm2skr4yf0gWE6EiFdDcd28CZj1Ta63reKUJfcxbWbcebSDoW8KZLbkDgH8GLe5l6sEuux7a/w== dependencies: "@babel/runtime" "^7.3.4" - "@polkadot/util" "^0.36.1" - "@polkadot/util-crypto" "^0.36.1" + "@polkadot/util" "^0.36.3" + "@polkadot/util-crypto" "^0.36.3" "@types/bs58" "^4.0.0" bs58 "^4.0.1" @@ -1450,14 +1450,14 @@ resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.56.tgz#ffd6e9c95704a7fb90b918193b9dc5c440114b27" integrity sha512-wnt4zXxZXyz6WaubTO/I+nUElwV2DogFzdl6CrKfVn2PTWp8uHN06W9s40FH57ORtmQfDr9rLRP8Nq+oIyElbg== -"@polkadot/util-crypto@^0.36.1": - version "0.36.1" - resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.36.1.tgz#8a706939bd9e2066a53f42c5573ca9b845be3827" - integrity sha512-To17e43Tl+a3b08BtM9LSoK9j49xnDA/V3YxNclHFMur+JEsraMYooNQegfehcQTCbnnkZW+j+TeadlvN1OCBw== +"@polkadot/util-crypto@^0.36.3": + version "0.36.3" + resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.36.3.tgz#abf585e9ef55a3c2c53419ab7d14a3db36cb6a9a" + integrity sha512-QMNSYkd3ZT0lD771P0ozEzplUf/YHhflS0Y0v17Z2oEBx2tSFa6MQ9R+fLXT6lFKOExnSHnJmNszZfwns4EyDg== dependencies: "@babel/runtime" "^7.3.4" "@polkadot/schnorrkel-js" "^0.1.2-3" - "@polkadot/util" "^0.36.1" + "@polkadot/util" "^0.36.3" "@types/bip39" "^2.4.2" "@types/pbkdf2" "^3.0.0" "@types/secp256k1" "^3.5.0" @@ -1470,10 +1470,10 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^0.36.1": - version "0.36.1" - resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.36.1.tgz#680b3e9358a9131f05a2e4fe7938cb03065a7afa" - integrity sha512-lAILZlBhPoSowtX1wjkZiJDE0y2TYLqe7QMQSaDvk5/u4VT9ZcSqdoIqeZWy0YInG8ISW3bd9L7rjNGmUGKpCg== +"@polkadot/util@^0.36.3": + version "0.36.3" + resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.36.3.tgz#de5fa37d7bfd7af3f1cb549d38f69b4114ee35ea" + integrity sha512-biDXsSSsJw1gVoobqBHFXE1RzXMz5DWAERO5h02ZwKRSsJROISsHzlD0MF4fNmiIzcHJ5pe08Ul6YzR1ZPhGEw== dependencies: "@babel/runtime" "^7.3.4" "@types/bn.js" "^4.11.4"