quantus/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Whack derive memo (#1546)

Browse Source 
* Whack derive memo

* Bump common
This commit is contained in:
Jaco Greeff
2019-11-05 14:36:53 +01:00
committed by GitHub
parent 3fd03b2498
commit 3998b1bcbd
44 changed files with 142 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-derive/package.json
+1 -1
View File
@@ -32,6 +32,6 @@
"@polkadot/types": "^0.96.0-beta.29"
},
"devDependencies": {
"@polkadot/keyring": "^1.7.0-beta.1"
"@polkadot/keyring": "^1.7.0-beta.2"
}
}
packages/api-derive/src/accounts/idAndIndex.ts
+3 -3
View File
@@ -13,7 +13,7 @@ import { createType } from '@polkadot/types';
import { idToIndex } from './idToIndex';
import { indexToId } from './indexToId';
import { drr, memo } from '../util';
import { drr } from '../util';
interface Calls {
idToIndexCall (accountId: string | AccountId): Observable<AccountIndex | undefined>;
@@ -60,7 +60,7 @@ function retrieve (address: Address | AccountId | AccountIndex | string | null |
* });
* ```
*/
export const idAndIndex = memo((api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | string | null) => Observable<AccountIdAndIndex> => {
export function idAndIndex (api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | string | null) => Observable<AccountIdAndIndex> {
const calls = {
idToIndexCall: idToIndex(api),
indexToIdCall: indexToId(api)
@@ -68,4 +68,4 @@ export const idAndIndex = memo((api: ApiInterfaceRx): (address?: Address | Accou
return (address?: Address | AccountId | AccountIndex | string | null): Observable<AccountIdAndIndex> =>
retrieve(address, calls).pipe(drr());
}, true);
}
packages/api-derive/src/accounts/idToIndex.ts
+3 -3
View File
@@ -9,7 +9,7 @@ import { map, startWith } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { indexes, AccountIndexes } from './indexes';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name idToIndex
@@ -25,7 +25,7 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const idToIndex = memo((api: ApiInterfaceRx): (accountId: AccountId | string) => Observable<AccountIndex | undefined> => {
export function idToIndex (api: ApiInterfaceRx): (accountId: AccountId | string) => Observable<AccountIndex | undefined> {
const indexesCall = indexes(api);
return (accountId: AccountId | string): Observable<AccountIndex | undefined> =>
@@ -36,4 +36,4 @@ export const idToIndex = memo((api: ApiInterfaceRx): (accountId: AccountId | str
),
drr()
);
}, true);
}
packages/api-derive/src/accounts/indexToId.ts
+3 -3
View File
@@ -10,7 +10,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
import { createType, ClassOf, Vec } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name indexToId
@@ -25,7 +25,7 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const indexToId = memo((api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable<AccountId | undefined> => {
export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable<AccountId | undefined> {
const querySection = api.query.indices || api.query.balances;
return (_accountIndex: AccountIndex | string): Observable<AccountId | undefined> => {
@@ -41,4 +41,4 @@ export const indexToId = memo((api: ApiInterfaceRx): (accountIndex: AccountIndex
drr()
);
};
}, true);
}
packages/api-derive/src/accounts/indexes.ts
+3 -3
View File
@@ -10,7 +10,7 @@ import { map, switchMap } from 'rxjs/operators';
import { ENUMSET_SIZE } from '@polkadot/types/primitive/Generic/AccountIndex';
import { createType } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
export type AccountIndexes = Record<string, AccountIndex>;
@@ -31,7 +31,7 @@ const enumsetSize = ENUMSET_SIZE.toNumber();
* });
* ```
*/
export const indexes = memo((api: ApiInterfaceRx): () => Observable<AccountIndexes> => {
export function indexes (api: ApiInterfaceRx): () => Observable<AccountIndexes> {
return (): Observable<AccountIndexes> =>
api.query.indices.nextEnumSet<AccountIndex>().pipe(
// use the nextEnumSet (which is a counter of the number of sets) to construct
@@ -55,4 +55,4 @@ export const indexes = memo((api: ApiInterfaceRx): () => Observable<AccountIndex
}, {} as AccountIndexes)),
drr()
);
}, true);
}
packages/api-derive/src/accounts/info.ts
+3 -3
View File
@@ -12,7 +12,7 @@ import { map, switchMap } from 'rxjs/operators';
import { Bytes, Option, u32 } from '@polkadot/types';
import { u8aToString } from '@polkadot/util';
import { drr, memo } from '../util';
import { drr } from '../util';
import { idAndIndex } from './idAndIndex';
function retrieveNick (api: ApiInterfaceRx): (accountId?: AccountId) => Observable<Option<[Bytes, Balance] & Codec> | undefined> {
@@ -26,7 +26,7 @@ function retrieveNick (api: ApiInterfaceRx): (accountId?: AccountId) => Observab
* @name info
* @description Returns aux. info with regards to an account, current that includes the accountId, accountIndex and nickname
*/
export const info = memo((api: ApiInterfaceRx): (address?: AccountIndex | AccountId | Address | string | null) => Observable<DeriveAccountInfo> => {
export function info (api: ApiInterfaceRx): (address?: AccountIndex | AccountId | Address | string | null) => Observable<DeriveAccountInfo> {
const idAndIndexCall = idAndIndex(api);
const nickCall = retrieveNick(api);
@@ -47,4 +47,4 @@ export const info = memo((api: ApiInterfaceRx): (address?: AccountIndex | Accoun
})),
drr()
);
}, true);
}
packages/api-derive/src/balances/all.ts
+3 -3
View File
@@ -14,7 +14,7 @@ import { bnMax } from '@polkadot/util';
import { info } from '../accounts/info';
import { bestNumber } from '../chain/bestNumber';
import { DerivedBalances } from '../types';
import { drr, memo } from '../util';
import { drr } from '../util';
type ResultBalance = [Balance, Balance, BalanceLock[], Option<VestingSchedule>];
type Result = [AccountId, BlockNumber, ResultBalance, Index];
@@ -77,7 +77,7 @@ function queryBalances (api: ApiInterfaceRx, accountId: AccountId): Observable<R
* });
* ```
*/
export const all = memo((api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DerivedBalances> => {
export function all (api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable<DerivedBalances> {
const bestNumberCall = bestNumber(api);
const infoCall = info(api);
@@ -102,4 +102,4 @@ export const all = memo((api: ApiInterfaceRx): (address: AccountIndex | AccountI
map(calcBalances),
drr()
);
}, true);
}
packages/api-derive/src/balances/fees.ts
+3 -3
View File
@@ -9,7 +9,7 @@ import { DerivedFees } from '../types';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
import { drr, memo } from '../util';
import { drr } from '../util';
type Result = [Balance, Balance, Balance, Balance, Balance];
@@ -51,7 +51,7 @@ function queryV1 (api: ApiInterfaceRx): Observable<Result> {
* });
* ```
*/
export const fees = memo((api: ApiInterfaceRx): () => Observable<DerivedFees> => {
export function fees (api: ApiInterfaceRx): () => Observable<DerivedFees> {
const query = api.consts.balances
? queryV2
: queryV1;
@@ -67,4 +67,4 @@ export const fees = memo((api: ApiInterfaceRx): () => Observable<DerivedFees> =>
})),
drr()
);
}, true);
}
packages/api-derive/src/balances/votingBalances.ts
+3 -3
View File
@@ -8,10 +8,10 @@ import { combineLatest, Observable, of } from 'rxjs';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { DerivedBalances } from '../types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { all } from './all';
export const votingBalances = memo((api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable<DerivedBalances[]> => {
export function votingBalances (api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable<DerivedBalances[]> {
return (addresses?: (AccountId | AccountIndex | Address | string)[]): Observable<DerivedBalances[]> =>
(
!addresses || !addresses.length
@@ -20,4 +20,4 @@ export const votingBalances = memo((api: ApiInterfaceRx): (addresses?: (AccountI
).pipe(
drr()
);
}, true);
}
packages/api-derive/src/balances/votingBalancesNominatorsFor.ts
+3 -3
View File
@@ -11,10 +11,10 @@ import { Vec } from '@polkadot/types';
import { info } from '../accounts/info';
import { DerivedBalances } from '../types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { votingBalances } from './votingBalances';
export const votingBalancesNominatorsFor = memo((api: ApiInterfaceRx): (address: AccountId | AccountIndex | Address | string) => Observable<DerivedBalances[]> => {
export function votingBalancesNominatorsFor (api: ApiInterfaceRx): (address: AccountId | AccountIndex | Address | string) => Observable<DerivedBalances[]> {
const infoCall = info(api);
return (address: AccountId | AccountIndex | Address | string): Observable<DerivedBalances[]> =>
@@ -27,4 +27,4 @@ export const votingBalancesNominatorsFor = memo((api: ApiInterfaceRx): (address:
switchMap(votingBalances(api)),
drr()
);
}, true);
}
packages/api-derive/src/chain/bestNumber.ts
+3 -3
View File
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name bestNumber
@@ -22,10 +22,10 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const bestNumber = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function bestNumber (api: ApiInterfaceRx): () => Observable<BlockNumber> {
return (): Observable<BlockNumber> =>
api.rpc.chain.subscribeNewHeads().pipe(
map((header): BlockNumber => header.number.unwrap()),
drr()
);
}, true);
}
packages/api-derive/src/chain/bestNumberFinalized.ts
+3 -3
View File
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name bestNumberFinalized
@@ -23,10 +23,10 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const bestNumberFinalized = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function bestNumberFinalized (api: ApiInterfaceRx): () => Observable<BlockNumber> {
return (): Observable<BlockNumber> =>
api.rpc.chain.subscribeFinalizedHeads().pipe(
map((header): BlockNumber => header.number.unwrap()),
drr()
);
}, true);
}
packages/api-derive/src/chain/bestNumberLag.ts
+3 -3
View File
@@ -9,7 +9,7 @@ import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { createType } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { bestNumber } from './bestNumber';
import { bestNumberFinalized } from './bestNumberFinalized';
@@ -26,7 +26,7 @@ import { bestNumberFinalized } from './bestNumberFinalized';
* });
* ```
*/
export const bestNumberLag = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function bestNumberLag (api: ApiInterfaceRx): () => Observable<BlockNumber> {
const bestNumberCall = bestNumber(api);
const bestNumberFinalizedCall = bestNumberFinalized(api);
@@ -40,4 +40,4 @@ export const bestNumberLag = memo((api: ApiInterfaceRx): () => Observable<BlockN
),
drr()
);
}, true);
}
packages/api-derive/src/chain/getHeader.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { catchError, map } from 'rxjs/operators';
import { Vec } from '@polkadot/types';
import { HeaderExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name bestNumberFinalized
@@ -27,7 +27,7 @@ import { drr, memo } from '../util';
* console.log(`block #${number} was authored by ${author}`);
* ```
*/
export const getHeader = memo((api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<HeaderExtended | undefined> => {
export function getHeader (api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable<HeaderExtended | undefined> {
return (hash: Uint8Array | string): Observable<HeaderExtended | undefined> =>
combineLatest([
api.rpc.chain.getHeader(hash),
@@ -44,4 +44,4 @@ export const getHeader = memo((api: ApiInterfaceRx): (hash: Uint8Array | string)
),
drr()
);
}, true);
}
packages/api-derive/src/chain/subscribeNewHeads.ts
+3 -3
View File
@@ -10,7 +10,7 @@ import { map } from 'rxjs/operators';
import { Vec } from '@polkadot/types';
import { HeaderExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name subscribeNewHeads
@@ -25,7 +25,7 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const subscribeNewHeads = memo((api: ApiInterfaceRx): () => Observable<HeaderExtended> => {
export function subscribeNewHeads (api: ApiInterfaceRx): () => Observable<HeaderExtended> {
return (): Observable<HeaderExtended> =>
combineLatest([
api.rpc.chain.subscribeNewHeads(),
@@ -36,4 +36,4 @@ export const subscribeNewHeads = memo((api: ApiInterfaceRx): () => Observable<He
),
drr()
);
}, true);
}
packages/api-derive/src/contracts/fees.ts
+3 -3
View File
@@ -9,7 +9,7 @@ import BN from 'bn.js';
import { Observable, of } from 'rxjs';
import { map } from 'rxjs/operators';
import { drr, memo } from '../util';
import { drr } from '../util';
type ResultV2 = [BN, BN, BN, BN, BN, BN, BN, BN, BN, BN];
@@ -103,7 +103,7 @@ function queryConstants (api: ApiInterfaceRx): Observable<ResultV2> {
* });
* ```
*/
export const fees = memo((api: ApiInterfaceRx): () => Observable<DerivedContractFees> => {
export function fees (api: ApiInterfaceRx): () => Observable<DerivedContractFees> {
return (): Observable<DerivedContractFees> => {
if (api.query.contract && !api.query.contract.rentByteFee) {
return queryV1(api);
@@ -123,4 +123,4 @@ export const fees = memo((api: ApiInterfaceRx): () => Observable<DerivedContract
drr()
);
};
}, true);
}
packages/api-derive/src/democracy/referendumInfo.ts
+3 -3
View File
@@ -12,7 +12,7 @@ import { Option } from '@polkadot/types';
import { isNull } from '@polkadot/util';
import { ReferendumInfoExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
export function constructInfo (index: BN | number, optionInfo?: Option<ReferendumInfo>): Option<ReferendumInfoExtended> {
const info = optionInfo
@@ -27,7 +27,7 @@ export function constructInfo (index: BN | number, optionInfo?: Option<Referendu
);
}
export const referendumInfo = memo((api: ApiInterfaceRx): (index: BN | number) => Observable<Option<ReferendumInfoExtended>> => {
export function referendumInfo (api: ApiInterfaceRx): (index: BN | number) => Observable<Option<ReferendumInfoExtended>> {
return (index: BN | number): Observable<Option<ReferendumInfoExtended>> =>
api.query.democracy.referendumInfoOf<Option<ReferendumInfo>>(index).pipe(
map((optionInfo): Option<ReferendumInfoExtended> =>
@@ -35,4 +35,4 @@ export const referendumInfo = memo((api: ApiInterfaceRx): (index: BN | number) =
),
drr()
);
}, true);
}
packages/api-derive/src/democracy/referendumInfos.ts
+3 -3
View File
@@ -11,10 +11,10 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { Option, Vec } from '@polkadot/types';
import { ReferendumInfoExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
import { constructInfo } from './referendumInfo';
export const referendumInfos = memo((api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<Option<ReferendumInfoExtended>[]> => {
export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable<Option<ReferendumInfoExtended>[]> {
return (ids: (BN | number)[] = []): Observable<Option<ReferendumInfoExtended>[]> =>
(
!ids || !ids.length
@@ -28,4 +28,4 @@ export const referendumInfos = memo((api: ApiInterfaceRx): (ids?: (BN | number)[
),
drr()
);
}, true);
}
packages/api-derive/src/democracy/referendumVotesFor.ts
+3 -3
View File
@@ -11,11 +11,11 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { Vec, createType } from '@polkadot/types';
import { DerivedBalances, DerivedReferendumVote } from '../types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { votes } from './votes';
import { votingBalances } from '../balances/votingBalances';
export const referendumVotesFor = memo((api: ApiInterfaceRx): (referendumId: BN | number) => Observable<DerivedReferendumVote[]> => {
export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | number) => Observable<DerivedReferendumVote[]> {
const votesCall = votes(api);
const votingBalancesCall = votingBalances(api);
@@ -37,4 +37,4 @@ export const referendumVotesFor = memo((api: ApiInterfaceRx): (referendumId: BN
),
drr()
);
}, true);
}
packages/api-derive/src/democracy/referendums.ts
+3 -3
View File
@@ -11,10 +11,10 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { Option } from '@polkadot/types';
import { ReferendumInfoExtended } from '../type';
import { drr, memo } from '../util';
import { drr } from '../util';
import { referendumInfos } from './referendumInfos';
export const referendums = memo((api: ApiInterfaceRx): () => Observable<Option<ReferendumInfoExtended>[]> => {
export function referendums (api: ApiInterfaceRx): () => Observable<Option<ReferendumInfoExtended>[]> {
const referendumInfosCall = referendumInfos(api);
return (): Observable<Option<ReferendumInfoExtended>[]> =>
@@ -33,4 +33,4 @@ export const referendums = memo((api: ApiInterfaceRx): () => Observable<Option<R
),
drr()
);
}, true);
}
packages/api-derive/src/democracy/votes.ts
+3 -3
View File
@@ -8,9 +8,9 @@ import BN from 'bn.js';
import { Observable, of } from 'rxjs';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
export const votes = memo((api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable<Vote[]> => {
export function votes (api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable<Vote[]> {
return (referendumId: BN, accountIds: AccountId[] = []): Observable<Vote[]> =>
(
!accountIds || !accountIds.length
@@ -21,4 +21,4 @@ export const votes = memo((api: ApiInterfaceRx): (referendumId: BN, accountIds?:
)
)
).pipe(drr());
}, true);
}
packages/api-derive/src/elections/approvalsOf.ts
+3 -3
View File
@@ -9,7 +9,7 @@ import { Observable } from 'rxjs';
import { Vec } from '@polkadot/types';
import { switchMap, map } from 'rxjs/operators';
import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name approvalsOf
@@ -23,7 +23,7 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const approvalsOf = memo((api: ApiInterfaceRx): (who: AccountId) => Observable<boolean[][]> => {
export function approvalsOf (api: ApiInterfaceRx): (who: AccountId) => Observable<boolean[][]> {
return (who: AccountId | string): Observable<boolean[][]> =>
api.query.elections.nextVoterSet<SetIndex>().pipe(
switchMap((nextVoterSet: SetIndex): Observable<Vec<ApprovalFlag>[]> =>
@@ -40,4 +40,4 @@ export const approvalsOf = memo((api: ApiInterfaceRx): (who: AccountId) => Obser
),
drr()
);
}, true);
}
packages/api-derive/src/elections/approvalsOfAt.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { Vec } from '@polkadot/types';
import { approvalFlagsToBools } from '../util/approvalFlagsToBools';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name approvalsOfAt
@@ -25,10 +25,10 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const approvalsOfAt = memo((api: ApiInterfaceRx): (who: AccountId, at: SetIndex) => Observable<boolean[]> => {
export function approvalsOfAt (api: ApiInterfaceRx): (who: AccountId, at: SetIndex) => Observable<boolean[]> {
return (who: AccountId | string, at: SetIndex | BN | number): Observable<boolean[]> =>
api.query.elections.approvalsOf<Vec<ApprovalFlag>>([who.toString(), at]).pipe(
map((flags: Vec<ApprovalFlag>): boolean[] => approvalFlagsToBools(flags)),
drr()
);
}, true);
}
packages/api-derive/src/elections/info.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { createType, Vec, u32 } from '@polkadot/types';
import { DerivedElectionsInfo } from '../types';
import { drr, memo } from '../util';
import { drr } from '../util';
type ResultElectionsInner = [u32, u32, Vec<[AccountId, BlockNumber] & Codec>, SetIndex, BlockNumber, VoteIndex, SetIndex];
type ResultElections = [Vec<AccountId>, ResultElectionsInner];
@@ -88,11 +88,11 @@ function queryPhragmen (api: ApiInterfaceRx): Observable<DerivedElectionsInfo> {
* });
* ```
*/
export const info = memo((api: ApiInterfaceRx): () => Observable<DerivedElectionsInfo> => {
export function info (api: ApiInterfaceRx): () => Observable<DerivedElectionsInfo> {
const query = api.query.electionsPhragmen
? queryPhragmen
: queryElections;
return (): Observable<DerivedElectionsInfo> =>
query(api).pipe(drr());
}, true);
}
packages/api-derive/src/elections/voterPositions.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import BN from 'bn.js';
import { of, combineLatest, Observable } from 'rxjs';
import { switchMap, map } from 'rxjs/operators';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @name voterPositions
@@ -26,7 +26,7 @@ import { drr, memo } from '../util';
* });
* ```
*/
export const voterPositions = memo((api: ApiInterfaceRx): () => Observable<DerivedVoterPositions> => {
export function voterPositions (api: ApiInterfaceRx): () => Observable<DerivedVoterPositions> {
return (): Observable<DerivedVoterPositions> =>
api.query.elections.nextVoterSet<SetIndex>().pipe(
switchMap((nextVoterSet: SetIndex): Observable<[BN, Vec<Option<AccountId>>[]]> => combineLatest(
@@ -55,4 +55,4 @@ export const voterPositions = memo((api: ApiInterfaceRx): () => Observable<Deriv
}),
drr()
);
}, true);
}
packages/api-derive/src/elections/voters.ts
+3 -3
View File
@@ -10,7 +10,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { createType, Vec } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { voterPositions } from './voterPositions';
/**
@@ -25,7 +25,7 @@ import { voterPositions } from './voterPositions';
* });
* ```
*/
export const voters = memo((api: ApiInterfaceRx): () => Observable<Vec<AccountId>> => {
export function voters (api: ApiInterfaceRx): () => Observable<Vec<AccountId>> {
const voterPositionsCall = voterPositions(api);
return (): Observable<Vec<AccountId>> =>
@@ -40,4 +40,4 @@ export const voters = memo((api: ApiInterfaceRx): () => Observable<Vec<AccountId
),
drr()
);
}, true);
}
packages/api-derive/src/imOnline/receivedHeartbeats.ts
+5 -5
View File
@@ -11,17 +11,17 @@ import { ApiInterfaceRx } from '@polkadot/api/types';
import { Bytes, Option, u32 } from '@polkadot/types';
import { overview as stakingOverview } from '../staking';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @description Return a boolean array indicating whether the passed accounts had received heartbeats in the current session
*/
export const receivedHeartbeats = memo((api: ApiInterfaceRx): () => Observable<DerivedHeartbeats> => {
const stakingOverviewvCall = stakingOverview(api);
export function receivedHeartbeats (api: ApiInterfaceRx): () => Observable<DerivedHeartbeats> {
const stakingOverviewCall = stakingOverview(api);
return (): Observable<DerivedHeartbeats> =>
api.query.imOnline && api.query.imOnline.receivedHeartbeats && api.query.imOnline.authoredBlocks
? stakingOverviewvCall().pipe(
? stakingOverviewCall().pipe(
switchMap(({ currentIndex, validators }): Observable<[AccountId[], Option<Bytes>[], u32[]]> =>
combineLatest([
of(validators),
@@ -42,4 +42,4 @@ export const receivedHeartbeats = memo((api: ApiInterfaceRx): () => Observable<D
drr()
)
: of({});
}, true);
}
packages/api-derive/src/session/eraLength.ts
+3 -3
View File
@@ -8,10 +8,10 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { info } from './info';
export const eraLength = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function eraLength (api: ApiInterfaceRx): () => Observable<BlockNumber> {
const infoCall = info(api);
return (): Observable<BlockNumber> =>
@@ -19,4 +19,4 @@ export const eraLength = memo((api: ApiInterfaceRx): () => Observable<BlockNumbe
map(({ eraLength }): BlockNumber => eraLength),
drr()
);
}, true);
}
packages/api-derive/src/session/eraProgress.ts
+3 -3
View File
@@ -8,10 +8,10 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { info } from './info';
export const eraProgress = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function eraProgress (api: ApiInterfaceRx): () => Observable<BlockNumber> {
const infoCall = info(api);
return (): Observable<BlockNumber> =>
@@ -19,4 +19,4 @@ export const eraProgress = memo((api: ApiInterfaceRx): () => Observable<BlockNum
map(({ eraProgress }): BlockNumber => eraProgress),
drr()
);
}, true);
}
packages/api-derive/src/session/indexes.ts
+3 -3
View File
@@ -10,9 +10,9 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { u32 } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
export const indexes = memo((api: ApiInterfaceRx): () => Observable<DeriveSessionIndexes> => {
export function indexes (api: ApiInterfaceRx): () => Observable<DeriveSessionIndexes> {
return (): Observable<DeriveSessionIndexes> =>
api.queryMulti<[SessionIndex, EraIndex, u32]>([
api.query.session.currentIndex,
@@ -24,4 +24,4 @@ export const indexes = memo((api: ApiInterfaceRx): () => Observable<DeriveSessio
})),
drr()
);
}, true);
}
packages/api-derive/src/session/info.ts
+3 -3
View File
@@ -10,7 +10,7 @@ import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { Option, u64, createType } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { bestNumber } from '../chain';
import { indexes } from './indexes';
@@ -127,7 +127,7 @@ function infoLatestBabe (api: ApiInterfaceRx, { indexesCall }: Calls): Observabl
/**
* @description Retrieves all the session and era info and calculates specific values on it as the length of the session and eras
*/
export const info = memo((api: ApiInterfaceRx): () => Observable<DerivedSessionInfo> => {
export function info (api: ApiInterfaceRx): () => Observable<DerivedSessionInfo> {
const calls = {
bestNumberCall: bestNumber(api),
indexesCall: indexes(api)
@@ -140,4 +140,4 @@ export const info = memo((api: ApiInterfaceRx): () => Observable<DerivedSessionI
return (): Observable<DerivedSessionInfo> =>
query(api, calls).pipe(drr());
}, true);
}
packages/api-derive/src/session/sessionProgress.ts
+3 -3
View File
@@ -8,10 +8,10 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { info } from './info';
export const sessionProgress = memo((api: ApiInterfaceRx): () => Observable<BlockNumber> => {
export function sessionProgress (api: ApiInterfaceRx): () => Observable<BlockNumber> {
const infoCall = info(api);
return (): Observable<BlockNumber> =>
@@ -19,4 +19,4 @@ export const sessionProgress = memo((api: ApiInterfaceRx): () => Observable<Bloc
map(({ sessionProgress }): BlockNumber => sessionProgress),
drr()
);
}, true);
}
packages/api-derive/src/staking/controllers.ts
+3 -3
View File
@@ -10,12 +10,12 @@ import { Observable, combineLatest, of } from 'rxjs';
import { switchMap } from 'rxjs/operators';
import { Option } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @description From the list of stash accounts, retrieve the list of controllers
*/
export const controllers = memo((api: ApiInterfaceRx): () => Observable<[AccountId[], Option<AccountId>[]]> => {
export function controllers (api: ApiInterfaceRx): () => Observable<[AccountId[], Option<AccountId>[]]> {
return (): Observable<[AccountId[], Option<AccountId>[]]> =>
api.query.staking.validators<[AccountId[]] & Codec>().pipe(
switchMap(([stashIds]): Observable<[AccountId[], Option<AccountId>[]]> =>
@@ -29,4 +29,4 @@ export const controllers = memo((api: ApiInterfaceRx): () => Observable<[Account
),
drr()
);
}, true);
}
packages/api-derive/src/staking/info.ts
+3 -3
View File
@@ -18,7 +18,7 @@ import { isUndefined } from '@polkadot/util';
import { bestNumber } from '../chain/bestNumber';
import { eraLength } from '../session/eraLength';
import { recentlyOffline } from './recentlyOffline';
import { drr, memo } from '../util';
import { drr } from '../util';
interface Calls {
bestNumberCall (): Observable<BlockNumber>;
@@ -222,7 +222,7 @@ function retrieveV2 (api: ApiInterfaceRx, calls: Calls, stashId: AccountId): Obs
/**
* @description From a stash, retrieve the controllerId and fill in all the relevant staking details
*/
export const info = memo((api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable<DerivedStaking> => {
export function info (api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable<DerivedStaking> {
const calls = {
eraLengthCall: eraLength(api),
bestNumberCall: bestNumber(api),
@@ -234,4 +234,4 @@ export const info = memo((api: ApiInterfaceRx): (_accountId: Uint8Array | string
return (accountId: Uint8Array | string): Observable<DerivedStaking> =>
query(api, calls, createType('AccountId', accountId)).pipe(drr());
}, true);
}
packages/api-derive/src/staking/infoStash.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { Option, Vec } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
// NOTE Unused ATM, preparing for V2-only
@@ -52,7 +52,7 @@ function retrieveV2 (api: ApiInterfaceRx, stashId: AccountId): Observable<Result
]);
}
export const infoStash = memo((api: ApiInterfaceRx): (stashId: AccountId) => Observable<DerivedStakingStash> => {
export function infoStash (api: ApiInterfaceRx): (stashId: AccountId) => Observable<DerivedStakingStash> {
const query = api.consts.session
? retrieveV2
: retrieveV1;
@@ -62,4 +62,4 @@ export const infoStash = memo((api: ApiInterfaceRx): (stashId: AccountId) => Obs
map((result): DerivedStakingStash => parse(stashId, result)),
drr()
);
}, true);
}
packages/api-derive/src/staking/overview.ts
+3 -3
View File
@@ -10,14 +10,14 @@ import { Observable, combineLatest, of } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
import { createType } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
import { indexes as sessionIndexes } from '../session';
import { validators } from './validators';
/**
* @description Retrieve the staking overview, including elected and points earned
*/
export const overview = memo((api: ApiInterfaceRx): () => Observable<DerivedStakingOverview> => {
export function overview (api: ApiInterfaceRx): () => Observable<DerivedStakingOverview> {
const sessionIndexesCall = sessionIndexes(api);
const validatorsCall = validators(api);
@@ -40,4 +40,4 @@ export const overview = memo((api: ApiInterfaceRx): () => Observable<DerivedStak
})),
drr()
);
}, true);
}
packages/api-derive/src/staking/recentlyOffline.ts
+3 -3
View File
@@ -11,7 +11,7 @@ import { map } from 'rxjs/operators';
import { ApiInterfaceRx } from '@polkadot/api/types';
import { DerivedRecentlyOffline } from '../types';
import { drr, memo } from '../util';
import { drr } from '../util';
type OfflineResult = [AccountId, BlockNumber, BN][] & Codec;
@@ -35,7 +35,7 @@ function expandDerived (recentlyOffline: OfflineResult): DerivedRecentlyOffline
/**
* @description Retrieve a keyed record of accounts recently reported to be offline
*/
export const recentlyOffline = memo((api: ApiInterfaceRx): () => Observable<DerivedRecentlyOffline> => {
export function recentlyOffline (api: ApiInterfaceRx): () => Observable<DerivedRecentlyOffline> {
return (): Observable<DerivedRecentlyOffline> =>
(
// TODO recentlyOffline has been dropped for 2.x and replaced, figure out the
@@ -47,4 +47,4 @@ export const recentlyOffline = memo((api: ApiInterfaceRx): () => Observable<Deri
map(expandDerived),
drr()
);
}, true);
}
packages/api-derive/src/staking/validators.ts
+3 -3
View File
@@ -10,12 +10,12 @@ import { Observable } from 'rxjs';
import { map } from 'rxjs/operators';
import { Vec } from '@polkadot/types';
import { drr, memo } from '../util';
import { drr } from '../util';
/**
* @description Retrieve latest list of validators
*/
export const validators = memo((api: ApiInterfaceRx): () => Observable<DeriveStakingValidators> => {
export function validators (api: ApiInterfaceRx): () => Observable<DeriveStakingValidators> {
return (): Observable<DeriveStakingValidators> =>
api.queryMulti<[Vec<AccountId>, Vec<AccountId>]>([
api.query.session.validators,
@@ -26,4 +26,4 @@ export const validators = memo((api: ApiInterfaceRx): () => Observable<DeriveSta
})),
drr()
);
}, true);
}
packages/api-metadata/package.json
+3 -3
View File
@@ -28,10 +28,10 @@
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/types": "^0.96.0-beta.29",
"@polkadot/util": "^1.7.0-beta.1",
"@polkadot/util-crypto": "^1.7.0-beta.1"
"@polkadot/util": "^1.7.0-beta.2",
"@polkadot/util-crypto": "^1.7.0-beta.2"
},
"devDependencies": {
"@polkadot/keyring": "^1.7.0-beta.1"
"@polkadot/keyring": "^1.7.0-beta.2"
}
}
packages/api/package.json
+3 -3
View File
@@ -29,13 +29,13 @@
"@babel/runtime": "^7.6.3",
"@polkadot/api-derive": "^0.96.0-beta.29",
"@polkadot/api-metadata": "^0.96.0-beta.29",
"@polkadot/keyring": "^1.7.0-beta.1",
"@polkadot/keyring": "^1.7.0-beta.2",
"@polkadot/rpc-core": "^0.96.0-beta.29",
"@polkadot/rpc-provider": "^0.96.0-beta.29",
"@polkadot/types": "^0.96.0-beta.29",
"@polkadot/util-crypto": "^1.7.0-beta.1"
"@polkadot/util-crypto": "^1.7.0-beta.2"
},
"devDependencies": {
"@polkadot/keyring": "^1.7.0-beta.1"
"@polkadot/keyring": "^1.7.0-beta.2"
}
}
packages/rpc-core/package.json
+1 -1
View File
@@ -30,7 +30,7 @@
"@polkadot/jsonrpc": "^0.96.0-beta.29",
"@polkadot/rpc-provider": "^0.96.0-beta.29",
"@polkadot/types": "^0.96.0-beta.29",
"@polkadot/util": "^1.7.0-beta.1",
"@polkadot/util": "^1.7.0-beta.2",
"rxjs": "^6.5.3"
}
}
packages/rpc-provider/package.json
+3 -3
View File
@@ -28,15 +28,15 @@
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/api-metadata": "^0.96.0-beta.29",
"@polkadot/util": "^1.7.0-beta.1",
"@polkadot/util-crypto": "^1.7.0-beta.1",
"@polkadot/util": "^1.7.0-beta.2",
"@polkadot/util-crypto": "^1.7.0-beta.2",
"@types/nock": "^11.1.0",
"eventemitter3": "^4.0.0",
"isomorphic-fetch": "^2.2.1",
"websocket": "^1.0.30"
},
"devDependencies": {
"@polkadot/keyring": "^1.7.0-beta.1",
"@polkadot/keyring": "^1.7.0-beta.2",
"mock-socket": "^9.0.2",
"nock": "^11.4.0"
}
packages/types/package.json
+3 -3
View File
@@ -27,12 +27,12 @@
"homepage": "https://github.com/polkadot-js/api/tree/master/packages/types#readme",
"dependencies": {
"@babel/runtime": "^7.6.3",
"@polkadot/util": "^1.7.0-beta.1",
"@polkadot/util-crypto": "^1.7.0-beta.1",
"@polkadot/util": "^1.7.0-beta.2",
"@polkadot/util-crypto": "^1.7.0-beta.2",
"@types/memoizee": "^0.4.3",
"memoizee": "^0.4.14"
},
"devDependencies": {
"@polkadot/keyring": "^1.7.0-beta.1"
"@polkadot/keyring": "^1.7.0-beta.2"
}
}
yarn.lock
+15 -15
View File
@@ -1835,14 +1835,14 @@
typescript "^3.6.4"
vuepress "^1.2.0"
"@polkadot/keyring@^1.7.0-beta.1":
version "1.7.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.0-beta.1.tgz#b57e006b0233d5ec7630876b1bc282c63aceab37"
integrity sha512-Twh21/kDHy6duT7PCeMKQv/rw0oHD/qSs6Hu3VYTItGXjtQqTntYYT0aRDfY5n3LHJl5uAHfDiqJBm3pCUhgxg==
"@polkadot/keyring@^1.7.0-beta.2":
version "1.7.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.0-beta.2.tgz#68bcc96670155452916ae81be57719472a9c2c8e"
integrity sha512-gOvLdA6VDxbLhFKByT/YKklkEuhby/HHbwr6QA4nSy0kbsqO0L7j3SqudxyOMlghwbJtDy5dn1wqQ5yO6PHcOA==
dependencies:
"@babel/runtime" "^7.6.3"
"@polkadot/util" "^1.7.0-beta.1"
"@polkadot/util-crypto" "^1.7.0-beta.1"
"@polkadot/util" "^1.7.0-beta.2"
"@polkadot/util-crypto" "^1.7.0-beta.2"
"@polkadot/ts@^0.1.83":
version "0.1.83"
@@ -1851,13 +1851,13 @@
dependencies:
"@types/chrome" "^0.0.91"
"@polkadot/util-crypto@^1.7.0-beta.1":
version "1.7.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.0-beta.1.tgz#e0a6b7725b74aacad5e74524d148fa70f2aa2634"
integrity sha512-T5XW8aQLAkikLtbn4+pPhiX6F+5yz9o+3/+Fwbpd6mpfzq608fY7tZyqFKPglulRtKHRTauaqYpbqqFMGpVmRQ==
"@polkadot/util-crypto@^1.7.0-beta.2":
version "1.7.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.0-beta.2.tgz#728058f2f23664e735b62aee744747629d0d99cb"
integrity sha512-D00TGi1FchHjylpEqlmL+3v31J14WMOvmMay8Z0Mhp3cJbMLbxBSvf7Ep8P/CwLXDZAizFhj6rcZeOYkJmzK0Q==
dependencies:
"@babel/runtime" "^7.6.3"
"@polkadot/util" "^1.7.0-beta.1"
"@polkadot/util" "^1.7.0-beta.2"
"@polkadot/wasm-crypto" "^0.14.1"
"@types/bip39" "^2.4.2"
"@types/bs58" "^4.0.0"
@@ -1873,10 +1873,10 @@
tweetnacl "^1.0.1"
xxhashjs "^0.2.2"
"@polkadot/util@^1.7.0-beta.1":
version "1.7.0-beta.1"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.0-beta.1.tgz#a3528b357548d7b916edded02b1d6e9db180ade7"
integrity sha512-5n0A+DgA8odmnft8bZm8o62Oly2ZmbAou3DWmu6AWrkjGrCUN1To95GBd10OwsH3sYh1iO0ZuZg8VlFJuaoKOw==
"@polkadot/util@^1.7.0-beta.2":
version "1.7.0-beta.2"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.0-beta.2.tgz#b65fc681578d55646e6cce626ed5e17b0661975d"
integrity sha512-qG788v8HPZqOF65CDIDvYWAEVKB8Ur9gBfAtdpX1PgdSbT1kiz2ajjcJ1zY9VHg5Y8SubzfISlmzZ37RcNhpGQ==
dependencies:
"@babel/runtime" "^7.6.3"
"@types/bn.js" "^4.11.5"