Move Event, Address, AccountId, AccountIndex to generic (#1202)

* Move Event, Address, AccountId, AccountIndex to generic

* Move AccountId, AccountIndex, Address & Event to generic

* Move Vote

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

@@ -2,13 +2,14 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+
 import { Observable, of } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 import { isU8a } from '@polkadot/util';
 import { decodeAddress } from '@polkadot/util-crypto';
-
+import { createType } from '@polkadot/types';
 import { idToIndex } from './idToIndex';
 import { indexToId } from './indexToId';
 import { drr } from '../util/drr';
@@ -37,7 +38,7 @@ export function idAndIndex (api: ApiInterfaceRx): (address?: Address | AccountId
         : decodeAddress((address || '').toString());
 
       if (decoded.length === 32) {
-        const accountId = new AccountId(decoded);
+        const accountId = createType('AccountId', decoded);
 
         return idToIndex(api)(accountId).pipe(
           startWith(undefined),
@@ -46,7 +47,7 @@ export function idAndIndex (api: ApiInterfaceRx): (address?: Address | AccountId
         );
       }
 
-      const accountIndex = new AccountIndex(decoded);
+      const accountIndex = createType('AccountIndex', decoded);
 
       return indexToId(api)(accountIndex).pipe(
         startWith(undefined),

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

@@ -2,10 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
+
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex } from '@polkadot/types';
 
 import { indexes, AccountIndexes } from './indexes';
 import { drr } from '../util/drr';

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

@@ -2,11 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
+
 import { Observable } from 'rxjs';
 import { map, startWith } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { ENUMSET_SIZE } from '@polkadot/types/primitive/AccountIndex';
-import { AccountId, AccountIndex, Vec } from '@polkadot/types';
+import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
+import { createType, ClassOf, Vec } from '@polkadot/types';
 
 import { drr } from '../util/drr';
 
@@ -26,9 +28,9 @@ import { drr } from '../util/drr';
 export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable<AccountId | undefined> {
   return (_accountIndex: AccountIndex | string): Observable<AccountId | undefined> => {
     const querySection = api.query.indices || api.query.balances;
-    const accountIndex = _accountIndex instanceof AccountIndex
+    const accountIndex = _accountIndex instanceof ClassOf('AccountIndex')
       ? _accountIndex
-      : new AccountIndex(_accountIndex);
+      : createType('AccountIndex', _accountIndex);
 
     return (querySection.enumSet<Vec<AccountId>>(accountIndex.div(ENUMSET_SIZE)))
       .pipe(

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

@@ -2,11 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
+
 import { Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { ENUMSET_SIZE } from '@polkadot/types/primitive/AccountIndex';
-import { AccountId, AccountIndex } from '@polkadot/types';
+import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
+import { createType } from '@polkadot/types';
 
 import { drr } from '../util/drr';
 
@@ -47,7 +49,7 @@ export function indexes (api: ApiInterfaceRx): () => Observable<AccountIndexes>
               // 64 (0..63 in first) is [1][0] (the first index value in set 2)
               const index = (outerIndex * enumsetSize) + innerIndex;
 
-              result[accountId.toString()] = new AccountIndex(index);
+              result[accountId.toString()] = createType('AccountIndex', index);
             });
 
             return result;

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

@@ -2,14 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { BalanceLock, VestingSchedule } from '@polkadot/types/interfaces/balances';
-import { Balance, BlockNumber, Index } from '@polkadot/types/interfaces/runtime';
+import { AccountId, AccountIndex, Address, Balance, BalanceLock, BlockNumber, Index, VestingSchedule } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import { combineLatest, of, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex, Address, ClassOf, Option, createType } from '@polkadot/types';
+import { ClassOf, Option, createType } from '@polkadot/types';
 import { bnMax } from '@polkadot/util';
 
 import { idAndIndex } from '../accounts/idAndIndex';
@@ -19,7 +18,7 @@ import { drr } from '../util/drr';
 
 type Result = [AccountId | undefined, BlockNumber | undefined, [Balance?, Balance?, BalanceLock[]?, Option<VestingSchedule>?, Index?]];
 
-const EMPTY_ACCOUNT = new AccountId();
+const EMPTY_ACCOUNT = createType('AccountId');
 const ZERO = createType('Balance', 0);
 
 function calcBalances ([accountId = EMPTY_ACCOUNT, bestNumber = ZERO, [freeBalance = ZERO, reservedBalance = ZERO, locks = [], vesting = new Option<VestingSchedule>(ClassOf('VestingSchedule'), null), accountNonce = ZERO]]: Result): DerivedBalances {

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

@@ -2,9 +2,10 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+
 import { combineLatest, Observable, of } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex, Address } from '@polkadot/types';
 
 import { DerivedBalances } from '../types';
 import { drr } from '../util/drr';

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

@@ -2,10 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
+
 import { Observable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, AccountIndex, Address, Vec } from '@polkadot/types';
+import { Vec } from '@polkadot/types';
 
 import { idAndIndex } from '../accounts/idAndIndex';
 import { DerivedBalances } from '../types';

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

@@ -2,12 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/types/interfaces';
+import { ApiInterfaceRx } from '@polkadot/api/types';
+import { AccountId, Header } from '@polkadot/types/interfaces';
 
 import { Observable, combineLatest, of } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
-import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId } from '@polkadot/types';
 
 import { HeaderExtended } from '../type';
 import { drr } from '../util/drr';

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

@@ -2,11 +2,13 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, Vote } from '@polkadot/types/interfaces';
+
 import BN from 'bn.js';
 import { combineLatest, Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Vec, Vote, createType } from '@polkadot/types';
+import { Vec, createType } from '@polkadot/types';
 
 import { DerivedBalances, DerivedReferendumVote } from '../types';
 import { drr } from '../util/drr';
@@ -26,8 +28,8 @@ export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | nu
       map(([votersFor, votes, balances]): DerivedReferendumVote[] =>
         votersFor.map((accountId, index): DerivedReferendumVote => ({
           accountId,
-          balance: balances[index].votingBalance || createType('Balance', 0),
-          vote: votes[index] || new Vote(0)
+          balance: balances[index].votingBalance || createType('Balance'),
+          vote: votes[index] || createType('Vote')
         } as unknown as DerivedReferendumVote))
       ),
       drr()

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

@@ -2,10 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId, Vote } from '@polkadot/types/interfaces';
+
 import BN from 'bn.js';
 import { Observable, of } from 'rxjs';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Vec, Vote } from '@polkadot/types';
+import { Vec } from '@polkadot/types';
 
 import { drr } from '../util/drr';
 

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

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApprovalFlag, SetIndex } from '@polkadot/types/interfaces/elections';
+import { AccountId, ApprovalFlag, SetIndex } from '@polkadot/types/interfaces';
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Observable } from 'rxjs';
-import { AccountId, Vec } from '@polkadot/types';
+import { Vec } from '@polkadot/types';
 import { switchMap, map } from 'rxjs/operators';
 import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
 import { drr } from '../util/drr';

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

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { ApprovalFlag, SetIndex } from '@polkadot/types/interfaces/elections';
+import { AccountId, ApprovalFlag, SetIndex } from '@polkadot/types/interfaces';
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Observable } from 'rxjs';
-import { AccountId, Vec } from '@polkadot/types';
+import { Vec } from '@polkadot/types';
 import { map } from 'rxjs/operators';
 import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
 import { drr } from '../util/drr';

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

@@ -2,14 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SetIndex, VoteIndex } from '@polkadot/types/interfaces/elections';
-import { BlockNumber } from '@polkadot/types/interfaces';
+import { AccountId, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId } from '@polkadot/types';
 
 import { DerivedElectionsInfo } from '../types';
 import { drr } from '../util/drr';

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

@@ -2,9 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SetIndex } from '@polkadot/types/interfaces/elections';
+import { AccountId, SetIndex } from '@polkadot/types/interfaces';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Vec, Option, createType } from '@polkadot/types';
+import { Vec, Option, createType } from '@polkadot/types';
 import { DerivedVoterPositions } from '../types';
 
 import BN from 'bn.js';

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

@@ -3,11 +3,13 @@
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Vec } from '@polkadot/types';
+import { AccountId } from '@polkadot/types/interfaces';
 import { DerivedVoterPositions } from '../types';
 
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { createType, Vec } from '@polkadot/types';
+
 import { drr } from '../util/drr';
 import { voterPositions } from './voterPositions';
 
@@ -28,11 +30,11 @@ export function voters (api: ApiInterfaceRx): () => Observable<Vec<AccountId>> {
     voterPositions(api)().pipe(
       map(
         (voterPositions: DerivedVoterPositions): Vec<AccountId> =>
-          new Vec(
-            AccountId,
+          createType(
+            'Vec<AccountId>',
             Object.entries(voterPositions)
               .sort((a, b): 0 | 1 | -1 => a[1].globalIndex.cmp(b[1].globalIndex))
-              .map(([accountId]): AccountId => new AccountId(accountId))
+              .map(([accountId]): AccountId => createType('AccountId', accountId))
           )
       ),
       drr()

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

@@ -2,10 +2,12 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import { AccountId } from '@polkadot/types/interfaces';
+
 import { Observable, combineLatest, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { ApiInterfaceRx } from '@polkadot/api/types';
-import { AccountId, Option } from '@polkadot/types';
+import { Option } from '@polkadot/types';
 
 import { drr } from '../util/drr';
 

packages/api-derive/src/staking/info.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 { BlockNumber } from '@polkadot/types/interfaces/runtime';
+import { AccountId, BlockNumber } from '@polkadot/types/interfaces/runtime';
 import { Keys } from '@polkadot/types/interfaces/session';
 import { Exposure, RewardDestination, StakingLedger, UnlockChunk, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
 
@@ -12,7 +12,7 @@ import { DerivedStaking, DerivedUnlocking } from '../types';
 import BN from 'bn.js';
 import { combineLatest, Observable, of } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
-import { createType, AccountId, Option, Tuple, Vec } from '@polkadot/types';
+import { createType, Option, Tuple, Vec } from '@polkadot/types';
 
 import { isUndefined } from '@polkadot/util';
 
@@ -199,7 +199,7 @@ function withControllerLedger (api: ApiInterfaceRx, accountId: AccountId, stakin
  */
 export function info (api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable<DerivedStaking> {
   return (_accountId: Uint8Array | string): Observable<DerivedStaking> => {
-    const accountId = new AccountId(_accountId);
+    const accountId = createType('AccountId', _accountId);
 
     return (
       api.queryMulti([

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

@@ -2,11 +2,11 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { Header } from '@polkadot/types/interfaces';
+import { AccountId, Header } from '@polkadot/types/interfaces';
 
 import { AnyJsonObject } from '@polkadot/types/types';
 
-import { AccountId, u64, ClassOf } from '@polkadot/types';
+import { u64, ClassOf } from '@polkadot/types';
 
 /**
  * @name HeaderExtended

packages/api-derive/src/types.ts

@@ -2,12 +2,9 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { SetIndex, VoteIndex } from '@polkadot/types/interfaces/elections';
-import { Balance, BlockNumber, Index } from '@polkadot/types/interfaces/runtime';
-import { Exposure, RewardDestination, StakingLedger, ValidatorPrefs } from '@polkadot/types/interfaces/staking';
+import { AccountId, Balance, BlockNumber, Exposure, Index, RewardDestination, SetIndex, StakingLedger, ValidatorPrefs, Vote, VoteIndex } from '@polkadot/types/interfaces';
 
 import BN from 'bn.js';
-import { AccountId, Vote } from '@polkadot/types';
 
 export interface DerivedBalances {
   accountId: AccountId;