Bump dev (sort imports) (#2923)

* Bump dev (sort imports)

* Resort

* Adjust ApiInterfaceRx

packages/api-contract/src/Abi.spec.ts

@@ -1,9 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Abi } from '.';
-
 import abis from '../test/contracts';
+import { Abi } from '.';
 
 interface JSONAbi {
   spec: {

packages/api-contract/src/Abi.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Bytes } from '@polkadot/types';
+import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageParamSpec, ContractMessageSpec, ContractProject } from '@polkadot/types/interfaces';
 import type { AnyJson, Codec, CodecArg } from '@polkadot/types/types';
-import type { ChainProperties, ContractConstructorSpec, ContractEventSpec, ContractMessageSpec, ContractMessageParamSpec, ContractProject } from '@polkadot/types/interfaces';
 import type { AbiConstructor, AbiEvent, AbiMessage, AbiParam, DecodedEvent, DecodedMessage } from './types';
 
 import { assert, assertReturn, compactAddLength, compactStripLength, isNumber, isObject, isString, logger, stringCamelCase, u8aConcat, u8aToHex } from '@polkadot/util';

packages/api-contract/src/MetaRegistry.spec.ts

@@ -4,9 +4,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { Abi } from '.';
-
 import abis from '../test/contracts';
+import { Abi } from '.';
 
 describe('MetaRegistry', (): void => {
   Object.keys(abis).forEach((abiName) => {

packages/api-contract/src/MetaRegistry.ts

@@ -1,12 +1,12 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ContractDisplayName, ChainProperties, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefVariant, SiTypeDefSequence, SiTypeDefTuple, SiVariant } from '@polkadot/types/interfaces';
+import type { ChainProperties, ContractDisplayName, SiField, SiLookupTypeId, SiType, SiTypeDefArray, SiTypeDefSequence, SiTypeDefTuple, SiTypeDefVariant, SiVariant } from '@polkadot/types/interfaces';
 import type { InterfaceTypes, TypeDef } from '@polkadot/types/types';
 
-import { assert, isUndefined } from '@polkadot/util';
 import { TypeRegistry, withTypeString } from '@polkadot/types/create';
 import { TypeDefInfo } from '@polkadot/types/types';
+import { assert, isUndefined } from '@polkadot/util';
 
 interface PartialTypeSpec {
   readonly type: SiLookupTypeId;

packages/api-contract/src/base/Blueprint.ts

@@ -1,18 +1,19 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { AccountId, EventRecord, Hash } from '@polkadot/types/interfaces';
 import type { AnyJson, CodecArg, ISubmittableResult } from '@polkadot/types/types';
 import type { AbiConstructor, BlueprintOptions } from '../types';
 import type { BlueprintDeploy, ContractGeneric, MapConstructorExec } from './types';
 
 import BN from 'bn.js';
+
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
 import { Bytes } from '@polkadot/types';
-import { isUndefined, stringCamelCase, compactAddLength, u8aToU8a } from '@polkadot/util';
+import { compactAddLength, isUndefined, stringCamelCase, u8aToU8a } from '@polkadot/util';
 import { randomAsU8a } from '@polkadot/util-crypto';
 
 import { Abi } from '../Abi';

packages/api-contract/src/base/Code.spec.ts

@@ -3,12 +3,13 @@
 
 import fs from 'fs';
 import path from 'path';
+
 import { decorateMethod } from '@polkadot/api/promise';
 
 import contractFlipper from '../../test/contracts/ink/flipper.contract.json';
 import abiFlipper from '../../test/contracts/ink/flipper.json';
-import { mockApi } from './mock';
 import { Code } from './Code';
+import { mockApi } from './mock';
 
 const wasmFlipper = fs.readFileSync(path.join(__dirname, '../../test/contracts/ink/flipper.wasm'));
 

packages/api-contract/src/base/Code.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { EventRecord, Hash } from '@polkadot/types/interfaces';
 import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 

packages/api-contract/src/base/Contract.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import type { Bytes } from '@polkadot/types';
 import type { AccountId, ContractExecResult, EventRecord } from '@polkadot/types/interfaces';
 import type { AnyJson, CodecArg, ISubmittableResult, Registry } from '@polkadot/types/types';
@@ -11,6 +11,7 @@ import type { ContractCallResult, ContractCallSend, ContractGeneric, ContractQue
 
 import BN from 'bn.js';
 import { map } from 'rxjs/operators';
+
 import { SubmittableResult } from '@polkadot/api';
 import { ApiBase } from '@polkadot/api/base';
 import { assert, bnToBn, isFunction, isUndefined, logger, stringCamelCase } from '@polkadot/util';

packages/api-contract/src/base/types.ts

@@ -3,8 +3,8 @@
 
 import type BN from 'bn.js';
 import type { Observable } from 'rxjs';
-import type { ApiTypes, ObsInnerType } from '@polkadot/api/types';
 import type { SubmittableExtrinsic } from '@polkadot/api/submittable/types';
+import type { ApiTypes, ObsInnerType } from '@polkadot/api/types';
 import type { AccountId } from '@polkadot/types/interfaces';
 import type { CodecArg } from '@polkadot/types/types';
 import type { AbiMessage, BlueprintOptions, ContractCallOutcome, ContractOptions } from '../types';

packages/api-contract/src/checkTypes.manual.ts

@@ -4,7 +4,7 @@
 // Simple non-runnable checks to test type definitions in the editor itself
 
 import { ApiPromise } from '@polkadot/api';
-import { TestKeyringMap, createTestPairs } from '@polkadot/keyring/testingPairs';
+import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';
 
 import abiIncrementer from '../test/contracts/ink/incrementer.json';
 import { BlueprintPromise, ContractPromise } from '.';

packages/api-contract/src/util.ts

@@ -8,8 +8,9 @@ import type { Codec, CodecArg, Registry, TypeDef } from '@polkadot/types/types';
 import type { BlueprintOptions, ContractOptions } from './types';
 
 import BN from 'bn.js';
+
 import { createTypeUnsafe } from '@polkadot/types/create';
-import { isBn, isBigInt, isNumber, isString } from '@polkadot/util';
+import { isBigInt, isBn, isNumber, isString } from '@polkadot/util';
 
 type ContractEvents = 'CodeStored' | 'ContractExecution' | 'Instantiated';
 

packages/api-derive/src/accounts/accountId.ts

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { isU8a, assertReturn } from '@polkadot/util';
+
+import { assertReturn, isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
 
 import { memo } from '../util';

packages/api-derive/src/accounts/idAndIndex.ts

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import type { AccountIdAndIndex } from '../types';
 
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+
 import { isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
 

packages/api-derive/src/accounts/idToIndex.ts

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 import type { AccountIndexes } from '../types';
 
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/accounts/identity.ts

@@ -10,6 +10,7 @@ import type { DeriveAccountRegistration, DeriveHasIdentity } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isHex, u8aToString } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/accounts/indexToId.ts

@@ -2,13 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 
 import { of } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+
 import { ENUMSET_SIZE } from '@polkadot/types/generic/AccountIndex';
 import { isFunction } from '@polkadot/util';
 

packages/api-derive/src/accounts/indexes.ts

@@ -9,6 +9,7 @@ import type { AccountIndexes } from '../types';
 
 import { of } from 'rxjs';
 import { map, startWith, switchMap } from 'rxjs/operators';
+
 import { ENUMSET_SIZE } from '@polkadot/types/generic/AccountIndex';
 import { isFunction } from '@polkadot/util';
 

packages/api-derive/src/accounts/info.ts

@@ -10,6 +10,7 @@ import type { DeriveAccountInfo, DeriveAccountRegistration } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { u8aToString } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/balances/account.ts

@@ -2,13 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { AccountId, AccountData, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountData, AccountId, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveBalancesAccount } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/balances/all.ts

@@ -10,6 +10,7 @@ import type { DeriveBalancesAccount, DeriveBalancesAll } from '../types';
 import BN from 'bn.js';
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { bnMax, isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/balances/votingBalances.ts

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import type { DeriveBalancesAccount } from '../types';
 
 import { combineLatest, of } from 'rxjs';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/chain/bestNumber.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
 
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/chain/bestNumberFinalized.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
 
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/chain/bestNumberLag.ts

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
 
 import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/chain/getBlock.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { combineLatest, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';

packages/api-derive/src/chain/getHeader.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { combineLatest, of } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';

packages/api-derive/src/chain/subscribeNewHeads.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { combineLatest, of } from 'rxjs';
 import { map } from 'rxjs/operators';

packages/api-derive/src/collective/proposals.ts

@@ -9,6 +9,7 @@ import type { DeriveCollectiveProposal } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { catchError, map, switchMap } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/council/votes.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Vec } from '@polkadot/types';
 import type { AccountId, Balance } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { DeriveCouncilVote, DeriveCouncilVotes } from '../types';
 
 import { combineLatest } from 'rxjs';

packages/api-derive/src/council/votesOf.ts

@@ -2,11 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { AccountId } from '@polkadot/types/interfaces';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId } from '@polkadot/types/interfaces';
 import type { DeriveCouncilVote } from '../types';
 
 import { map } from 'rxjs/operators';
+
 import { memo } from '../util';
 
 export function votesOf (instanceId: string, api: ApiInterfaceRx): (accountId: string | Uint8Array | AccountId) => Observable<DeriveCouncilVote> {

packages/api-derive/src/democracy/dispatchQueue.ts

@@ -3,13 +3,14 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option, Vec, u64 } from '@polkadot/types';
+import type { Option, u64, Vec } from '@polkadot/types';
 import type { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveDispatch, DeriveProposalImage } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isFunction, stringToHex } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/democracy/locks.ts

@@ -2,14 +2,15 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option } from '@polkadot/types';
 import type { AccountId, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
-import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { DeriveDemocracyLock } from '../types';
 
 import BN from 'bn.js';
 import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { BN_ZERO, isUndefined } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/democracy/preimages.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { DeriveProposalImage } from '../types';
 
 import { map } from 'rxjs/operators';

packages/api-derive/src/democracy/proposals.ts

@@ -6,10 +6,11 @@ import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
 import type { AccountId, Balance, Hash, PropIndex } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { DeriveProposalImage, DeriveProposal } from '../types';
+import type { DeriveProposal, DeriveProposalImage } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/democracy/referendumsInfo.ts

@@ -4,12 +4,13 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
-import type { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDirectVote, VotingDelegating } from '@polkadot/types/interfaces';
+import type { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDelegating, VotingDirectVote } from '@polkadot/types/interfaces';
 import type { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types';
 
 import BN from 'bn.js';
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/democracy/sqrtElectorate.ts

@@ -2,10 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 
 import BN from 'bn.js';
 import { map } from 'rxjs/operators';
+
 import { bnSqrt } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/democracy/types.ts

@@ -3,7 +3,7 @@
 
 import type BN from 'bn.js';
 import type { Vec } from '@polkadot/types';
-import type { AccountId, Balance, BlockNumber, Hash, Proposal, PropIndex, ReferendumInfoTo239, ReferendumStatus, Vote, ReferendumIndex, VoteThreshold } from '@polkadot/types/interfaces';
+import type { AccountId, Balance, BlockNumber, Hash, PropIndex, Proposal, ReferendumIndex, ReferendumInfoTo239, ReferendumStatus, Vote, VoteThreshold } from '@polkadot/types/interfaces';
 
 export interface DeriveDemocracyLock {
   balance: Balance;

packages/api-derive/src/democracy/util.ts

@@ -8,6 +8,7 @@ import type { ITuple } from '@polkadot/types/types';
 import type { DeriveProposalImage, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes, DeriveReferendumVoteState } from '../types';
 
 import BN from 'bn.js';
+
 import { bnSqrt } from '@polkadot/util';
 
 type PreimageInfo = [Bytes, AccountId, Balance, BlockNumber];

packages/api-derive/src/elections/info.ts

@@ -3,7 +3,7 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Vec, u32 } from '@polkadot/types';
+import type { u32, Vec } from '@polkadot/types';
 import type { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveElectionsInfo } from './types';

packages/api-derive/src/elections/types.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
 import type { u32 } from '@polkadot/types';
+import type { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
 
 export interface DeriveElectionsInfo {
   candidates: AccountId[];

packages/api-derive/src/imOnline/receivedHeartbeats.ts

@@ -9,6 +9,7 @@ import type { DeriveHeartbeats } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { BN_ZERO } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/index.spec.ts

@@ -5,7 +5,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 
-import { Observable, from } from 'rxjs';
+import { from, Observable } from 'rxjs';
+
 import { ApiRx } from '@polkadot/api/rx';
 import { MockProvider } from '@polkadot/rpc-provider/mock';
 import { TypeRegistry } from '@polkadot/types/create';

packages/api-derive/src/parachains/info.ts

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { CollatorId, ParaId } from '@polkadot/types/interfaces';
-import type { DeriveParachainInfo, DeriveParachainFull, DeriveParachainActive } from '../types';
+import type { DeriveParachainActive, DeriveParachainFull, DeriveParachainInfo } from '../types';
 import type { Active, DidUpdate, Heads, ParaInfoResult, PendingSwap, RelayDispatchQueue, RetryQueue, SelectedThreads } from './types';
 
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 import { didUpdateToBool } from './util';

packages/api-derive/src/parachains/overview.ts

@@ -2,13 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { ParaId } from '@polkadot/types/interfaces';
 import type { DeriveParachain, DeriveParachainInfo } from '../types';
 import type { DidUpdate, ParaInfoResult, PendingSwap, RelayDispatchQueueSize } from './types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 import { didUpdateToBool } from './util';

packages/api-derive/src/parachains/types.ts

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type { Bytes, Option, u32, Vec } from '@polkadot/types';
 import type { CollatorId, ParaId, ParaInfo, Retriable, UpwardMessage } from '@polkadot/types/interfaces';
 import type { ITuple } from '@polkadot/types/types';
-import type { Bytes, Option, u32, Vec } from '@polkadot/types';
 
 export type ParaInfoResult = Option<ParaInfo>;
 export type PendingSwap = Option<ParaId>;

packages/api-derive/src/session/eraLength.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
 
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/session/eraProgress.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
 
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/session/indexes.ts

@@ -9,6 +9,7 @@ import type { DeriveSessionIndexes } from '../types';
 
 import { of } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/session/info.ts

@@ -5,7 +5,7 @@ import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { u64 } from '@polkadot/types';
 import type { SessionIndex } from '@polkadot/types/interfaces';
-import type { DeriveSessionInfo, DeriveSessionIndexes } from '../types';
+import type { DeriveSessionIndexes, DeriveSessionInfo } from '../types';
 
 import { map } from 'rxjs/operators';
 

packages/api-derive/src/session/progress.ts

@@ -9,6 +9,7 @@ import type { DeriveSessionInfo, DeriveSessionProgress } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/session/sessionProgress.ts

@@ -2,10 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { BlockNumber } from '@polkadot/types/interfaces';
 
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/session/types.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { BlockNumber, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
 import type { Option, u32 } from '@polkadot/types';
+import type { BlockNumber, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';
 
 export interface DeriveSessionIndexes {
   activeEra: EraIndex;

packages/api-derive/src/society/info.ts

@@ -3,7 +3,7 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option, Vec, u32 } from '@polkadot/types';
+import type { Option, u32, Vec } from '@polkadot/types';
 import type { AccountId, BalanceOf, Bid } from '@polkadot/types/interfaces';
 import type { DeriveSociety } from '../types';
 

packages/api-derive/src/staking/account.ts

@@ -8,6 +8,7 @@ import type { DeriveSessionInfo, DeriveStakingAccount, DeriveStakingKeys, Derive
 import BN from 'bn.js';
 import { combineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { BN_ZERO } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/staking/currentPoints.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { AccountId, EraPoints, EraRewardPoints, RewardPoint } from '@polkadot/types/interfaces';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { AccountId, EraPoints, EraRewardPoints, RewardPoint } from '@polkadot/types/interfaces';
 
 import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';

packages/api-derive/src/staking/erasPoints.ts

@@ -8,6 +8,7 @@ import type { DeriveEraPoints, DeriveEraValPoints } from '../types';
 
 import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { BN_ZERO } from '@polkadot/util';
 
 import { deriveCache, memo } from '../util';

packages/api-derive/src/staking/ownExposure.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
+import type { EraIndex, Exposure } from '@polkadot/types/interfaces';
 import type { DeriveOwnExposure } from '../types';
 
 import { combineLatest, of } from 'rxjs';

packages/api-derive/src/staking/query.ts

@@ -10,6 +10,7 @@ import type { DeriveStakingQuery } from '../types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/staking/stakerExposure.ts

@@ -4,7 +4,7 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EraIndex } from '@polkadot/types/interfaces';
-import type { DeriveStakerExposure, DeriveEraValidatorExposure } from '../types';
+import type { DeriveEraValidatorExposure, DeriveStakerExposure } from '../types';
 
 import { map, switchMap } from 'rxjs/operators';
 

packages/api-derive/src/staking/stakerRewards.ts

@@ -11,6 +11,7 @@ import type { DeriveStakingQuery } from './types';
 import BN from 'bn.js';
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { isFunction } from '@polkadot/util';
 
 import { memo } from '../util';

packages/api-derive/src/tx/events.ts

@@ -2,11 +2,11 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { EventRecord, Hash, SignedBlock } from '@polkadot/types/interfaces';
 
 import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
 
 import { memo } from '../util';
 

packages/api-derive/src/tx/signingInfo.ts

@@ -2,12 +2,13 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Header, Index } from '@polkadot/types/interfaces';
 import type { AnyNumber, Codec, IExtrinsicEra } from '@polkadot/types/types';
 
 import { combineLatest, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
+
 import { isNumber, isUndefined } from '@polkadot/util';
 
 import { FALLBACK_MAX_HASH_COUNT, FALLBACK_PERIOD, MAX_FINALITY_LAG, MORTAL_PERIOD } from './constants';

packages/api-derive/src/type/HeaderExtended.ts

@@ -4,8 +4,8 @@
 import type { AccountId, Header } from '@polkadot/types/interfaces';
 import type { AnyJson, Constructor, Registry } from '@polkadot/types/types';
 
-import runtimeTypes from '@polkadot/types/interfaces/runtime/definitions';
 import { Struct } from '@polkadot/types';
+import runtimeTypes from '@polkadot/types/interfaces/runtime/definitions';
 
 import { extractAuthor } from './util';
 

packages/api-derive/src/type/SignedBlockExtended.ts

@@ -4,8 +4,8 @@
 import type { AccountId, SignedBlock } from '@polkadot/types/interfaces';
 import type { AnyJson, Constructor, Registry } from '@polkadot/types/types';
 
-import runtimeTypes from '@polkadot/types/interfaces/runtime/definitions';
 import { Struct } from '@polkadot/types';
+import runtimeTypes from '@polkadot/types/interfaces/runtime/definitions';
 
 import { extractAuthor } from './util';
 

packages/api-derive/src/types.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type BN from 'bn.js';
-import type { AccountId, Balance, BalanceLock, BalanceLockTo212, BalanceOf, Bid, BidKind, BlockNumber, Hash, Index, Proposal, ProposalIndex, SetIndex, SocietyVote, StrikeCount, TreasuryProposal, Votes, VouchingStatus } from '@polkadot/types/interfaces';
 import type { u32 } from '@polkadot/types';
+import type { AccountId, Balance, BalanceLock, BalanceLockTo212, BalanceOf, Bid, BidKind, BlockNumber, Hash, Index, Proposal, ProposalIndex, SetIndex, SocietyVote, StrikeCount, TreasuryProposal, Votes, VouchingStatus } from '@polkadot/types/interfaces';
 
 export * from './accounts/types';
 export * from './chain/types';

packages/api-derive/src/util/approvalFlagsToBools.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { ApprovalFlag } from '@polkadot/types/interfaces/elections';
 import type { Vec } from '@polkadot/types';
+import type { ApprovalFlag } from '@polkadot/types/interfaces/elections';
 
 /** @internal */
 export function approvalFlagsToBools (flags: Vec<ApprovalFlag> | ApprovalFlag[]): boolean[] {

packages/api-derive/src/util/memo.ts

@@ -5,6 +5,7 @@ import type { Observer, TeardownLogic } from 'rxjs';
 
 import createMemo from 'memoizee';
 import { Observable } from 'rxjs';
+
 import { drr, normalizer } from '@polkadot/rpc-core/util';
 
 type ObsFn <T> = (...params: any[]) => Observable<T>;

packages/api/src/base/Decorate.ts

@@ -8,18 +8,19 @@ import type { Call, Hash, RuntimeVersion } from '@polkadot/types/interfaces';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { AnyFunction, CallFunction, Codec, CodecArg as Arg, InterfaceTypes, Registry, RegistryTypes } from '@polkadot/types/types';
 import type { SubmittableExtrinsic } from '../submittable/types';
-import type { ApiInterfaceRx, ApiOptions, ApiTypes, DecorateMethod, DecoratedRpc, DecoratedRpcSection, PaginationOptions, QueryableConsts, QueryableModuleStorage, QueryableStorage, QueryableStorageEntry, QueryableStorageMulti, QueryableStorageMultiArg, SubmittableExtrinsicFunction, SubmittableExtrinsics, SubmittableModuleExtrinsics } from '../types';
+import type { ApiInterfaceRx, ApiOptions, ApiTypes, DecoratedRpc, DecoratedRpcSection, DecorateMethod, PaginationOptions, QueryableConsts, QueryableModuleStorage, QueryableStorage, QueryableStorageEntry, QueryableStorageMulti, QueryableStorageMultiArg, SubmittableExtrinsicFunction, SubmittableExtrinsics, SubmittableModuleExtrinsics } from '../types';
 
 import BN from 'bn.js';
-import { BehaviorSubject, Observable, combineLatest, of } from 'rxjs';
+import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { map, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { ExactDerive, decorateDerive } from '@polkadot/api-derive';
+
+import { decorateDerive, ExactDerive } from '@polkadot/api-derive';
 import { memo } from '@polkadot/api-derive/util';
-import { Metadata, expandMetadata } from '@polkadot/metadata';
+import { expandMetadata, Metadata } from '@polkadot/metadata';
 import { RpcCore } from '@polkadot/rpc-core';
 import { WsProvider } from '@polkadot/rpc-provider';
-import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/extrinsic/constants';
 import { TypeRegistry } from '@polkadot/types/create';
+import { DEFAULT_VERSION as EXTRINSIC_DEFAULT_VERSION } from '@polkadot/types/extrinsic/constants';
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 import { assert, compactStripLength, logger, u8aToHex } from '@polkadot/util';
 

packages/api/src/base/Init.ts

@@ -3,7 +3,7 @@
 
 import type { Observable, Subscription } from 'rxjs';
 import type { Text } from '@polkadot/types';
-import type { ChainProperties, SignedBlock, RuntimeVersion } from '@polkadot/types/interfaces';
+import type { ChainProperties, RuntimeVersion, SignedBlock } from '@polkadot/types/interfaces';
 import type { Registry } from '@polkadot/types/types';
 import type { ApiBase, ApiOptions, ApiTypes, DecorateMethod } from '../types';
 import type { VersionedRegistry } from './types';
@@ -11,11 +11,12 @@ import type { VersionedRegistry } from './types';
 import BN from 'bn.js';
 import { of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
+
 import { Metadata } from '@polkadot/metadata';
 import { TypeRegistry } from '@polkadot/types/create';
 import { LATEST_EXTRINSIC_VERSION } from '@polkadot/types/extrinsic/Extrinsic';
 import { getSpecAlias, getSpecTypes, getUpgradeVersion } from '@polkadot/types-known';
-import { BN_ZERO, assert, logger, u8aEq, u8aToU8a } from '@polkadot/util';
+import { assert, BN_ZERO, logger, u8aEq, u8aToU8a } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';
 
 import { Decorate } from './Decorate';

packages/api/src/base/types.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type BN from 'bn.js';
-import type { Constants } from '@polkadot/metadata/decorate/types';
 import type { Metadata } from '@polkadot/metadata';
+import type { Constants } from '@polkadot/metadata/decorate/types';
 import type { Registry } from '@polkadot/types/types';
 
 export interface VersionedRegistry {

packages/api/src/checkTypes.manual.ts

@@ -8,7 +8,7 @@ import type { IExtrinsic, IMethod } from '@polkadot/types/types';
 
 import { ApiPromise } from '@polkadot/api';
 import { HeaderExtended } from '@polkadot/api-derive';
-import { TestKeyringMap, createTestPairs } from '@polkadot/keyring/testingPairs';
+import { createTestPairs, TestKeyringMap } from '@polkadot/keyring/testingPairs';
 import { createTypeUnsafe, TypeRegistry } from '@polkadot/types/create';
 
 import { SubmittableResult } from './';

packages/api/src/promise/index.ts

@@ -6,7 +6,8 @@ import type { ApiOptions, DecorateFn, DecorateMethodOptions, ObsInnerType, Stora
 
 import { EMPTY, Observable, Subscription } from 'rxjs';
 import { catchError, tap } from 'rxjs/operators';
-import { isFunction, assert } from '@polkadot/util';
+
+import { assert, isFunction } from '@polkadot/util';
 
 import { ApiBase } from '../base';
 import { Combinator, CombinatorCallback, CombinatorFunction } from './Combinator';

packages/api/src/rx/index.spec.ts

@@ -5,6 +5,7 @@ import type { Observable } from 'rxjs';
 import type { SubmittableExtrinsic } from '../submittable/types';
 
 import { map, switchMap } from 'rxjs/operators';
+
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import { MockProvider } from '@polkadot/rpc-provider/mock';
 import { TypeRegistry } from '@polkadot/types/create';

packages/api/src/submittable/Result.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { DispatchError, DispatchInfo, ExtrinsicStatus, EventRecord } from '@polkadot/types/interfaces';
+import type { DispatchError, DispatchInfo, EventRecord, ExtrinsicStatus } from '@polkadot/types/interfaces';
 import type { AnyJson, ISubmittableResult } from '@polkadot/types/types';
 import type { SubmittableResultValue } from './types';
 

packages/api/src/submittable/createClass.ts

@@ -5,16 +5,17 @@
 
 import type { Observable } from 'rxjs';
 import type { Address, ApplyExtrinsicResult, Call, Extrinsic, ExtrinsicEra, ExtrinsicStatus, Hash, Header, Index, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
-import type { Callback, Codec, Constructor, IKeyringPair, Registry, SignatureOptions, ISubmittableResult } from '@polkadot/types/types';
+import type { Callback, Codec, Constructor, IKeyringPair, ISubmittableResult, Registry, SignatureOptions } from '@polkadot/types/types';
 import type { ApiInterfaceRx, ApiTypes, SignerResult } from '../types';
-import type { AddressOrPair, SignerOptions, SubmittableExtrinsic, SubmittableDryRunResult, SubmittablePaymentResult, SubmittableResultResult, SubmittableResultSubscription, SubmittableThis } from './types';
+import type { AddressOrPair, SignerOptions, SubmittableDryRunResult, SubmittableExtrinsic, SubmittablePaymentResult, SubmittableResultResult, SubmittableResultSubscription, SubmittableThis } from './types';
 
 import { of } from 'rxjs';
 import { first, map, mapTo, mergeMap, switchMap, tap } from 'rxjs/operators';
+
 import { assert, isBn, isFunction, isNumber, isString, isU8a } from '@polkadot/util';
 
-import { filterEvents, isKeyringPair } from '../util';
 import { ApiBase } from '../base';
+import { filterEvents, isKeyringPair } from '../util';
 import { SubmittableResult } from './Result';
 
 interface SubmittableOptions<ApiType extends ApiTypes> {

packages/api/src/submittable/types.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Observable } from 'rxjs';
-import type { AccountId, Address, ApplyExtrinsicResult, DispatchError, DispatchInfo, Extrinsic, ExtrinsicStatus, EventRecord, Hash, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
-import type { AnyNumber, Callback, Codec, IExtrinsicEra, IKeyringPair, Signer, ISubmittableResult } from '@polkadot/types/types';
+import type { AccountId, Address, ApplyExtrinsicResult, DispatchError, DispatchInfo, EventRecord, Extrinsic, ExtrinsicStatus, Hash, RuntimeDispatchInfo } from '@polkadot/types/interfaces';
+import type { AnyNumber, Callback, Codec, IExtrinsicEra, IKeyringPair, ISubmittableResult, Signer } from '@polkadot/types/types';
 import type { ApiTypes } from '../types';
 
 export interface SubmittableResultValue {

packages/api/src/types/base.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Observable } from 'rxjs';
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
+import type { Observable } from 'rxjs';
 import type { AnyFunction, Callback, Codec, CodecArg } from '@polkadot/types/types';
 
 // Prepend an element V onto the beginning of a tuple T.

packages/api/src/types/index.ts

@@ -6,13 +6,13 @@ import '@polkadot/api/augment';
 
 import type BN from 'bn.js';
 import type { DeriveCustom, ExactDerive } from '@polkadot/api-derive';
+import type { Metadata } from '@polkadot/metadata';
 import type { RpcInterface } from '@polkadot/rpc-core/types';
 import type { ProviderInterface, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
-import type { Metadata } from '@polkadot/metadata';
 import type { Hash, RuntimeVersion } from '@polkadot/types/interfaces';
-import type { DefinitionRpc, DefinitionRpcSub, Signer, SignatureOptions, Registry, RegisteredTypes } from '@polkadot/types/types';
-import type { DeriveAllSections } from '../util/decorate';
+import type { DefinitionRpc, DefinitionRpcSub, RegisteredTypes, Registry, SignatureOptions, Signer } from '@polkadot/types/types';
 import type { ApiBase } from '../base';
+import type { DeriveAllSections } from '../util/decorate';
 import type { QueryableConsts } from './consts';
 import type { DecoratedRpc } from './rpc';
 import type { QueryableStorage, QueryableStorageMulti } from './storage';

packages/api/src/types/rpc.ts

@@ -6,7 +6,7 @@ import type { Json, Raw } from '@polkadot/types/codec';
 import type { AnyFunction, Callback } from '@polkadot/types/types';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-import { ApiTypes, Push, PromiseResult, RxResult, UnsubscribePromise } from './base';
+import { ApiTypes, PromiseResult, Push, RxResult, UnsubscribePromise } from './base';
 
 export interface RpcRxResult<F extends AnyFunction> extends RxResult<F> {
   json (...args: Parameters<F>): Observable<Json>;

packages/api/src/types/storage.ts

@@ -4,8 +4,8 @@
 import type { Observable } from 'rxjs';
 import type { StorageKey, u64 } from '@polkadot/types';
 import type { Hash } from '@polkadot/types/interfaces';
-import type { AnyFunction, Callback, Codec, CodecArg } from '@polkadot/types/types';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
+import type { AnyFunction, Callback, Codec, CodecArg } from '@polkadot/types/types';
 import type { ApiTypes, MethodResult, ObsInnerType, PaginationOptions, PromiseOrObs, UnsubscribePromise } from './base';
 
 interface StorageEntryObservableMulti {

packages/api/src/util/validate.spec.ts

@@ -1,9 +1,8 @@
 // Copyright 2017-2019 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { Storage } from '@polkadot/metadata/decorate/types';
-
 import { Metadata, storageFromMeta } from '@polkadot/metadata';
+import { Storage } from '@polkadot/metadata/decorate/types';
 import metaStatic from '@polkadot/metadata/static';
 import { TypeRegistry } from '@polkadot/types/create';
 

packages/api/src/util/validate.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2019 @polkadot/api authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { Type } from '@polkadot/types';
+import type { StorageEntry } from '@polkadot/types/primitive/types';
 
 import { assert, isUndefined } from '@polkadot/util';
 

packages/metadata/src/MagicNumber.spec.ts

@@ -3,7 +3,7 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import { MagicNumber, MAGIC_NUMBER } from './MagicNumber';
+import { MAGIC_NUMBER, MagicNumber } from './MagicNumber';
 
 describe('MagicNumber', (): void => {
   const registry = new TypeRegistry();

packages/metadata/src/MagicNumber.ts

@@ -3,9 +3,8 @@
 
 import type { AnyNumber, Registry } from '@polkadot/types/types';
 
-import { assert } from '@polkadot/util';
-
 import { U32 } from '@polkadot/types/primitive';
+import { assert } from '@polkadot/util';
 
 export const MAGIC_NUMBER = 0x6174656d; // `meta`, reversed for Little Endian encoding
 

packages/metadata/src/Metadata.spec.ts

@@ -3,8 +3,8 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import substrateData from './static';
 import { Metadata } from './Metadata';
+import substrateData from './static';
 
 describe('Metadata', (): void => {
   it('allows creation from hex with JSON equivalence', (): void => {

packages/metadata/src/MetadataVersioned.ts

@@ -7,11 +7,11 @@ import type { Registry } from '@polkadot/types/types';
 import { Struct } from '@polkadot/types/codec';
 import { assert } from '@polkadot/util';
 
-import { MagicNumber } from './MagicNumber';
 import { toV10 } from './v9/toV10';
 import { toV11 } from './v10/toV11';
 import { toV12 } from './v11/toV12';
 import { toLatest } from './v12/toLatest';
+import { MagicNumber } from './MagicNumber';
 import { getUniqTypes, toCallsOnly } from './util';
 
 type MetaMapped = MetadataV9 | MetadataV10 | MetadataV11 | MetadataV12;

packages/metadata/src/decorate/consts/fromMetadata.ts

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Registry } from '@polkadot/types/types';
-import type { Constants, ConstantCodec, ModuleConstants } from '../types';
+import type { ConstantCodec, Constants, ModuleConstants } from '../types';
 
 import { hexToU8a, stringCamelCase } from '@polkadot/util';
 

packages/metadata/src/decorate/extrinsics/index.spec.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import BN from 'bn.js';
+
 import { createTestPairs } from '@polkadot/keyring/testingPairs';
 import { TypeRegistry } from '@polkadot/types/create';
 

packages/metadata/src/decorate/storage/createFunction.ts

@@ -6,12 +6,13 @@ import type { StorageEntry } from '@polkadot/types/primitive/types';
 import type { Codec, Registry } from '@polkadot/types/types';
 
 import BN from 'bn.js';
+
 import { Raw } from '@polkadot/types/codec';
 import { StorageKey } from '@polkadot/types/primitive';
 import { assert, compactAddLength, compactStripLength, isNull, isUndefined, stringLowerFirst, u8aConcat } from '@polkadot/util';
 import { xxhashAsU8a } from '@polkadot/util-crypto';
 
-import { HasherFunction, getHasher } from './getHasher';
+import { getHasher, HasherFunction } from './getHasher';
 
 export interface CreateItemOptions {
   key?: string;

packages/metadata/src/decorate/storage/getHasher.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { AllHashers } from '@polkadot/types/interfaces/metadata/definitions';
 import type { StorageHasher } from '@polkadot/types/interfaces';
+import type { AllHashers } from '@polkadot/types/interfaces/metadata/definitions';
 
 import { u8aConcat, u8aToU8a } from '@polkadot/util';
 import { blake2AsU8a, xxhashAsU8a } from '@polkadot/util-crypto';

packages/metadata/src/decorate/types.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { AugmentedConst, QueryableConsts, QueryableModuleConsts } from '@polkadot/api/types/consts';
-import type { Codec, ModulesWithCalls } from '@polkadot/types/types';
 import type { StorageEntry } from '@polkadot/types/primitive/types';
+import type { Codec, ModulesWithCalls } from '@polkadot/types/types';
 
 export interface ModuleStorage {
   [key: string]: StorageEntry;

packages/metadata/src/types.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Codec } from '@polkadot/types/types';
 import type { Vec } from '@polkadot/types/codec';
+import type { Codec } from '@polkadot/types/types';
 
 export interface MetadataInterface<Modules extends Codec> extends Codec {
   modules: Vec<Modules>;

packages/metadata/src/util/getUniqTypes.ts

@@ -1,9 +1,9 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Codec, Registry } from '@polkadot/types/types';
 import type { Option, Vec } from '@polkadot/types/codec';
 import type { Text, Type } from '@polkadot/types/primitive';
+import type { Codec, Registry } from '@polkadot/types/types';
 
 import { flattenUniq } from './flattenUniq';
 import { validateTypes } from './validateTypes';

packages/metadata/src/util/testUtil.ts

@@ -6,8 +6,8 @@ import type { MetadataInterface } from '../types';
 
 import { unwrapStorageType } from '@polkadot/types/primitive/StorageKey';
 
-import { getUniqTypes } from './getUniqTypes';
 import { Metadata } from '../Metadata';
+import { getUniqTypes } from './getUniqTypes';
 
 /** @internal */
 export function decodeLatestSubstrate<Modules extends Codec> (registry: Registry, version: number, rpcData: string, staticSubstrate: Record<string, unknown>): void {

packages/metadata/src/util/toCallsOnly.spec.ts

@@ -3,8 +3,8 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import staticData from '../static';
 import { Metadata } from '../Metadata';
+import staticData from '../static';
 
 describe('toCallsOnly', (): void => {
   const registry = new TypeRegistry();

packages/metadata/src/v10/Metadata.spec.ts

@@ -3,9 +3,9 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import substrateJson from './static-substrate.json';
-import substrateData from './static';
 import { decodeLatestSubstrate, defaultValues, toLatest } from '../util/testUtil';
+import substrateData from './static';
+import substrateJson from './static-substrate.json';
 
 describe('MetadataV10 (substrate)', (): void => {
   const registry = new TypeRegistry();

packages/metadata/src/v11/Metadata.spec.ts

@@ -3,9 +3,9 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import substrateJson from './static-substrate.json';
-import substrateData from './static';
 import { decodeLatestSubstrate, defaultValues, toLatest } from '../util/testUtil';
+import substrateData from './static';
+import substrateJson from './static-substrate.json';
 
 describe('MetadataV11 (substrate)', (): void => {
   const registry = new TypeRegistry();

packages/metadata/src/v12/Metadata.spec.ts

@@ -3,9 +3,9 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import substrateJson from './static-substrate.json';
-import substrateData from './static';
 import { decodeLatestSubstrate, defaultValues, toLatest } from '../util/testUtil';
+import substrateData from './static';
+import substrateJson from './static-substrate.json';
 
 describe('MetadataV12 (substrate)', (): void => {
   const registry = new TypeRegistry();

packages/metadata/src/v12/toLatest.ts

@@ -1,11 +1,11 @@
 // Copyright 2017-2020 @polkadot/metadata authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { EventMetadataV12, EventMetadataLatest, FunctionMetadataV12, FunctionMetadataLatest, MetadataV12, MetadataLatest, ModuleMetadataLatest, ModuleMetadataV12, StorageMetadataV12, StorageMetadataLatest, StorageEntryMetadataLatest } from '@polkadot/types/interfaces/metadata';
-import type { Registry, OverrideModuleType } from '@polkadot/types/types';
+import type { EventMetadataLatest, EventMetadataV12, FunctionMetadataLatest, FunctionMetadataV12, MetadataLatest, MetadataV12, ModuleMetadataLatest, ModuleMetadataV12, StorageEntryMetadataLatest, StorageMetadataLatest, StorageMetadataV12 } from '@polkadot/types/interfaces/metadata';
+import type { OverrideModuleType, Registry } from '@polkadot/types/types';
 
-import { getModuleTypes } from '@polkadot/types-known';
 import { Type } from '@polkadot/types/primitive';
+import { getModuleTypes } from '@polkadot/types-known';
 import { stringCamelCase } from '@polkadot/util';
 
 // Since we don't have insight into the origin specification, we can only define what we know about

packages/metadata/src/v9/Metadata.spec.ts

@@ -3,9 +3,9 @@
 
 import { TypeRegistry } from '@polkadot/types/create';
 
-import substrateJson from './static-substrate.json';
-import substrateData from './static';
 import { decodeLatestSubstrate, defaultValues, toLatest } from '../util/testUtil';
+import substrateData from './static';
+import substrateJson from './static-substrate.json';
 
 describe('MetadataV9 (substrate)', (): void => {
   const registry = new TypeRegistry();