From e601ae27a197633eb7a4506985141ab18154e67c Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Sun, 3 Nov 2019 13:28:42 +0100 Subject: [PATCH] Re-add derive memo (def. has an impact) (#1539) --- .../api-derive/src/accounts/idAndIndex.ts | 10 ++++---- packages/api-derive/src/accounts/idToIndex.ts | 10 ++++---- packages/api-derive/src/accounts/indexToId.ts | 10 ++++---- packages/api-derive/src/accounts/indexes.ts | 10 ++++---- packages/api-derive/src/accounts/info.ts | 10 ++++---- packages/api-derive/src/balances/all.ts | 13 +++++----- packages/api-derive/src/balances/fees.ts | 13 +++++----- .../api-derive/src/balances/votingBalances.ts | 13 +++++----- .../balances/votingBalancesNominatorsFor.ts | 13 +++++----- packages/api-derive/src/chain/bestNumber.ts | 10 ++++---- .../src/chain/bestNumberFinalized.ts | 10 ++++---- .../api-derive/src/chain/bestNumberLag.ts | 10 ++++---- packages/api-derive/src/chain/getHeader.ts | 10 ++++---- .../api-derive/src/chain/subscribeNewHeads.ts | 10 ++++---- packages/api-derive/src/contracts/fees.ts | 10 ++++---- .../src/democracy/referendumInfo.ts | 13 +++++----- .../src/democracy/referendumInfos.ts | 13 +++++----- .../src/democracy/referendumVotesFor.ts | 10 ++++---- .../api-derive/src/democracy/referendums.ts | 10 ++++---- packages/api-derive/src/democracy/votes.ts | 18 +++++++------- .../api-derive/src/elections/approvalsOf.ts | 10 ++++---- .../api-derive/src/elections/approvalsOfAt.ts | 10 ++++---- packages/api-derive/src/elections/info.ts | 21 ++++++++-------- .../src/elections/voterPositions.ts | 10 ++++---- packages/api-derive/src/elections/voters.ts | 10 ++++---- .../src/imOnline/receivedHeartbeats.ts | 13 +++++----- packages/api-derive/src/session/eraLength.ts | 10 ++++---- .../api-derive/src/session/eraProgress.ts | 10 ++++---- packages/api-derive/src/session/indexes.ts | 10 ++++---- packages/api-derive/src/session/info.ts | 10 ++++---- .../api-derive/src/session/sessionProgress.ts | 10 ++++---- .../api-derive/src/staking/controllers.ts | 10 ++++---- packages/api-derive/src/staking/info.ts | 24 ++++++++----------- packages/api-derive/src/staking/infoStash.ts | 10 ++++---- packages/api-derive/src/staking/overview.ts | 10 ++++---- .../api-derive/src/staking/recentlyOffline.ts | 10 ++++---- packages/api-derive/src/staking/validators.ts | 10 ++++---- 37 files changed, 206 insertions(+), 218 deletions(-) diff --git a/packages/api-derive/src/accounts/idAndIndex.ts b/packages/api-derive/src/accounts/idAndIndex.ts index d3f7a69778..2415251b74 100644 --- a/packages/api-derive/src/accounts/idAndIndex.ts +++ b/packages/api-derive/src/accounts/idAndIndex.ts @@ -13,7 +13,7 @@ import { createType } from '@polkadot/types'; import { idToIndex } from './idToIndex'; import { indexToId } from './indexToId'; -import { drr } from '../util'; +import { drr, memo } from '../util'; interface Calls { idToIndexCall (accountId: string | AccountId): Observable; @@ -60,12 +60,12 @@ function retrieve (address: Address | AccountId | AccountIndex | string | null | * }); * ``` */ -export function idAndIndex (api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | string | null) => Observable { +export const idAndIndex = memo((api: ApiInterfaceRx): (address?: Address | AccountId | AccountIndex | string | null) => Observable => { const calls = { idToIndexCall: idToIndex(api), indexToIdCall: indexToId(api) }; - return (address?: Address | AccountId | AccountIndex | string | null): Observable => - retrieve(address, calls).pipe(drr()); -} + return memo((address?: Address | AccountId | AccountIndex | string | null): Observable => + retrieve(address, calls).pipe(drr())); +}, true); diff --git a/packages/api-derive/src/accounts/idToIndex.ts b/packages/api-derive/src/accounts/idToIndex.ts index a294a85fff..5a4f225dd6 100644 --- a/packages/api-derive/src/accounts/idToIndex.ts +++ b/packages/api-derive/src/accounts/idToIndex.ts @@ -9,7 +9,7 @@ import { map, startWith } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; import { indexes, AccountIndexes } from './indexes'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @name idToIndex @@ -25,15 +25,15 @@ import { drr } from '../util'; * }); * ``` */ -export function idToIndex (api: ApiInterfaceRx): (accountId: AccountId | string) => Observable { +export const idToIndex = memo((api: ApiInterfaceRx): (accountId: AccountId | string) => Observable => { const indexesCall = indexes(api); - return (accountId: AccountId | string): Observable => + return memo((accountId: AccountId | string): Observable => indexesCall().pipe( startWith({}), map((indexes: AccountIndexes): AccountIndex | undefined => (indexes || {})[accountId.toString()] ), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/accounts/indexToId.ts b/packages/api-derive/src/accounts/indexToId.ts index d3d68c7cd5..0b682ae5a2 100644 --- a/packages/api-derive/src/accounts/indexToId.ts +++ b/packages/api-derive/src/accounts/indexToId.ts @@ -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 } from '../util'; +import { drr, memo } from '../util'; /** * @name indexToId @@ -25,10 +25,10 @@ import { drr } from '../util'; * }); * ``` */ -export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable { +export const indexToId = memo((api: ApiInterfaceRx): (accountIndex: AccountIndex | string) => Observable => { const querySection = api.query.indices || api.query.balances; - return (_accountIndex: AccountIndex | string): Observable => { + return memo((_accountIndex: AccountIndex | string): Observable => { const accountIndex = _accountIndex instanceof ClassOf('AccountIndex') ? _accountIndex : createType('AccountIndex', _accountIndex); @@ -40,5 +40,5 @@ export function indexToId (api: ApiInterfaceRx): (accountIndex: AccountIndex | s ), drr() ); - }; -} + }); +}, true); diff --git a/packages/api-derive/src/accounts/indexes.ts b/packages/api-derive/src/accounts/indexes.ts index 6874b54db2..cba58355da 100644 --- a/packages/api-derive/src/accounts/indexes.ts +++ b/packages/api-derive/src/accounts/indexes.ts @@ -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 } from '../util'; +import { drr, memo } from '../util'; export type AccountIndexes = Record; @@ -31,8 +31,8 @@ const enumsetSize = ENUMSET_SIZE.toNumber(); * }); * ``` */ -export function indexes (api: ApiInterfaceRx): () => Observable { - return (): Observable => +export const indexes = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => api.query.indices.nextEnumSet().pipe( // use the nextEnumSet (which is a counter of the number of sets) to construct // a range of values to query [0, 1, 2, ...]. Retrieve the full enum set for the @@ -54,5 +54,5 @@ export function indexes (api: ApiInterfaceRx): () => Observable return result; }, {} as AccountIndexes)), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/accounts/info.ts b/packages/api-derive/src/accounts/info.ts index 91b59348d4..675002edef 100644 --- a/packages/api-derive/src/accounts/info.ts +++ b/packages/api-derive/src/accounts/info.ts @@ -12,7 +12,7 @@ import { map, switchMap } from 'rxjs/operators'; import { Bytes, Option, u32 } from '@polkadot/types'; import { u8aToString } from '@polkadot/util'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { idAndIndex } from './idAndIndex'; function retrieveNick (api: ApiInterfaceRx): (accountId?: AccountId) => Observable | undefined> { @@ -26,11 +26,11 @@ 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 function info (api: ApiInterfaceRx): (address?: AccountIndex | AccountId | Address | string | null) => Observable { +export const info = memo((api: ApiInterfaceRx): (address?: AccountIndex | AccountId | Address | string | null) => Observable => { const idAndIndexCall = idAndIndex(api); const nickCall = retrieveNick(api); - return (address?: AccountIndex | AccountId | Address | string | null): Observable => + return memo((address?: AccountIndex | AccountId | Address | string | null): Observable => idAndIndexCall(address).pipe( switchMap(([accountId, accountIndex]): Observable<[DeriveAccountInfo, Option<[Bytes, Balance] & Codec>?]> => combineLatest([ @@ -46,5 +46,5 @@ export function info (api: ApiInterfaceRx): (address?: AccountIndex | AccountId : undefined })), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/balances/all.ts b/packages/api-derive/src/balances/all.ts index b789cae5cf..b77e0df5a5 100644 --- a/packages/api-derive/src/balances/all.ts +++ b/packages/api-derive/src/balances/all.ts @@ -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 } from '../util'; +import { drr, memo } from '../util'; type ResultBalance = [Balance, Balance, BalanceLock[], Option]; type Result = [AccountId, BlockNumber, ResultBalance, Index]; @@ -77,12 +77,12 @@ function queryBalances (api: ApiInterfaceRx, accountId: AccountId): Observable Observable { +export const all = memo((api: ApiInterfaceRx): (address: AccountIndex | AccountId | Address | string) => Observable => { const bestNumberCall = bestNumber(api); const infoCall = info(api); - return (address: AccountIndex | AccountId | Address | string): Observable => { - return infoCall(address).pipe( + return memo((address: AccountIndex | AccountId | Address | string): Observable => + infoCall(address).pipe( switchMap(({ accountId }): Observable => (accountId ? combineLatest([ @@ -101,6 +101,5 @@ export function all (api: ApiInterfaceRx): (address: AccountIndex | AccountId | ), map(calcBalances), drr() - ); - }; -} + )); +}, true); diff --git a/packages/api-derive/src/balances/fees.ts b/packages/api-derive/src/balances/fees.ts index 85b2ae01ae..397ab784b7 100644 --- a/packages/api-derive/src/balances/fees.ts +++ b/packages/api-derive/src/balances/fees.ts @@ -9,7 +9,7 @@ import { DerivedFees } from '../types'; import { Observable, of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { drr } from '../util'; +import { drr, memo } from '../util'; type Result = [Balance, Balance, Balance, Balance, Balance]; @@ -51,13 +51,13 @@ function queryV1 (api: ApiInterfaceRx): Observable { * }); * ``` */ -export function fees (api: ApiInterfaceRx): () => Observable { +export const fees = memo((api: ApiInterfaceRx): () => Observable => { const query = api.consts.balances ? queryV2 : queryV1; - return (): Observable => { - return query(api).pipe( + return memo((): Observable => + query(api).pipe( map(([creationFee, existentialDeposit, transferFee, transactionBaseFee, transactionByteFee]): DerivedFees => ({ creationFee, existentialDeposit, @@ -66,6 +66,5 @@ export function fees (api: ApiInterfaceRx): () => Observable { transferFee })), drr() - ); - }; -} + )); +}, true); diff --git a/packages/api-derive/src/balances/votingBalances.ts b/packages/api-derive/src/balances/votingBalances.ts index d886a03529..6a59e1ec25 100644 --- a/packages/api-derive/src/balances/votingBalances.ts +++ b/packages/api-derive/src/balances/votingBalances.ts @@ -8,17 +8,16 @@ import { combineLatest, Observable, of } from 'rxjs'; import { ApiInterfaceRx } from '@polkadot/api/types'; import { DerivedBalances } from '../types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { all } from './all'; -export function votingBalances (api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable { - return (addresses?: (AccountId | AccountIndex | Address | string)[]): Observable => { - return ( +export const votingBalances = memo((api: ApiInterfaceRx): (addresses?: (AccountId | AccountIndex | Address | string)[]) => Observable => { + return memo((addresses?: (AccountId | AccountIndex | Address | string)[]): Observable => + ( !addresses || !addresses.length ? of([] as DerivedBalances[]) : combineLatest(addresses.map(all(api))) ).pipe( drr() - ); - }; -} + )); +}, true); diff --git a/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts b/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts index 88302f684c..d656cc7c5b 100644 --- a/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts +++ b/packages/api-derive/src/balances/votingBalancesNominatorsFor.ts @@ -11,14 +11,14 @@ import { Vec } from '@polkadot/types'; import { info } from '../accounts/info'; import { DerivedBalances } from '../types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { votingBalances } from './votingBalances'; -export function votingBalancesNominatorsFor (api: ApiInterfaceRx): (address: AccountId | AccountIndex | Address | string) => Observable { +export const votingBalancesNominatorsFor = memo((api: ApiInterfaceRx): (address: AccountId | AccountIndex | Address | string) => Observable => { const infoCall = info(api); - return (address: AccountId | AccountIndex | Address | string): Observable => { - return infoCall(address).pipe( + return memo((address: AccountId | AccountIndex | Address | string): Observable => + infoCall(address).pipe( switchMap(({ accountId }): Observable => accountId ? (api.query.staking.nominatorsFor>(accountId)) @@ -26,6 +26,5 @@ export function votingBalancesNominatorsFor (api: ApiInterfaceRx): (address: Acc ), switchMap(votingBalances(api)), drr() - ); - }; -} + )); +}, true); diff --git a/packages/api-derive/src/chain/bestNumber.ts b/packages/api-derive/src/chain/bestNumber.ts index fcf06ed9ab..bfff383851 100644 --- a/packages/api-derive/src/chain/bestNumber.ts +++ b/packages/api-derive/src/chain/bestNumber.ts @@ -8,7 +8,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @name bestNumber @@ -22,10 +22,10 @@ import { drr } from '../util'; * }); * ``` */ -export function bestNumber (api: ApiInterfaceRx): () => Observable { - return (): Observable => +export const bestNumber = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => api.rpc.chain.subscribeNewHeads().pipe( map((header): BlockNumber => header.number.unwrap()), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/chain/bestNumberFinalized.ts b/packages/api-derive/src/chain/bestNumberFinalized.ts index 6462c6ec6b..fded122325 100644 --- a/packages/api-derive/src/chain/bestNumberFinalized.ts +++ b/packages/api-derive/src/chain/bestNumberFinalized.ts @@ -8,7 +8,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @name bestNumberFinalized @@ -23,10 +23,10 @@ import { drr } from '../util'; * }); * ``` */ -export function bestNumberFinalized (api: ApiInterfaceRx): () => Observable { - return (): Observable => +export const bestNumberFinalized = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => api.rpc.chain.subscribeFinalizedHeads().pipe( map((header): BlockNumber => header.number.unwrap()), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/chain/bestNumberLag.ts b/packages/api-derive/src/chain/bestNumberLag.ts index 9be067e986..696273d321 100644 --- a/packages/api-derive/src/chain/bestNumberLag.ts +++ b/packages/api-derive/src/chain/bestNumberLag.ts @@ -9,7 +9,7 @@ import { map } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; import { createType } from '@polkadot/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { bestNumber } from './bestNumber'; import { bestNumberFinalized } from './bestNumberFinalized'; @@ -26,11 +26,11 @@ import { bestNumberFinalized } from './bestNumberFinalized'; * }); * ``` */ -export function bestNumberLag (api: ApiInterfaceRx): () => Observable { +export const bestNumberLag = memo((api: ApiInterfaceRx): () => Observable => { const bestNumberCall = bestNumber(api); const bestNumberFinalizedCall = bestNumberFinalized(api); - return (): Observable => + return memo((): Observable => combineLatest([ bestNumberCall(), bestNumberFinalizedCall() @@ -39,5 +39,5 @@ export function bestNumberLag (api: ApiInterfaceRx): () => Observable Observable { - return (hash: Uint8Array | string): Observable => +export const getHeader = memo((api: ApiInterfaceRx): (hash: Uint8Array | string) => Observable => { + return memo((hash: Uint8Array | string): Observable => combineLatest([ api.rpc.chain.getHeader(hash), api.query.session.validators.at(hash) as Observable> @@ -43,5 +43,5 @@ export function getHeader (api: ApiInterfaceRx): (hash: Uint8Array | string) => of() ), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/chain/subscribeNewHeads.ts b/packages/api-derive/src/chain/subscribeNewHeads.ts index 37cb7abec6..e0eb723569 100644 --- a/packages/api-derive/src/chain/subscribeNewHeads.ts +++ b/packages/api-derive/src/chain/subscribeNewHeads.ts @@ -10,7 +10,7 @@ import { map } from 'rxjs/operators'; import { Vec } from '@polkadot/types'; import { HeaderExtended } from '../type'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @name subscribeNewHeads @@ -25,8 +25,8 @@ import { drr } from '../util'; * }); * ``` */ -export function subscribeNewHeads (api: ApiInterfaceRx): () => Observable { - return (): Observable => +export const subscribeNewHeads = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => combineLatest([ api.rpc.chain.subscribeNewHeads(), api.query.session.validators>() @@ -35,5 +35,5 @@ export function subscribeNewHeads (api: ApiInterfaceRx): () => Observable
{ * }); * ``` */ -export function fees (api: ApiInterfaceRx): () => Observable { - return (): Observable => { +export const fees = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => { if (api.query.contract && !api.query.contract.rentByteFee) { return queryV1(api); } @@ -122,5 +122,5 @@ export function fees (api: ApiInterfaceRx): () => Observable): Option { const info = optionInfo @@ -27,14 +27,13 @@ export function constructInfo (index: BN | number, optionInfo?: Option Observable> { - return (index: BN | number): Observable> => { - return (api.query.democracy.referendumInfoOf>(index)) +export const referendumInfo = memo((api: ApiInterfaceRx): (index: BN | number) => Observable> => { + return memo((index: BN | number): Observable> => + (api.query.democracy.referendumInfoOf>(index)) .pipe( map((optionInfo): Option => constructInfo(index, optionInfo) ), drr() - ); - }; -} + )); +}, true); diff --git a/packages/api-derive/src/democracy/referendumInfos.ts b/packages/api-derive/src/democracy/referendumInfos.ts index 8b49e80e1c..a79020f3f4 100644 --- a/packages/api-derive/src/democracy/referendumInfos.ts +++ b/packages/api-derive/src/democracy/referendumInfos.ts @@ -11,12 +11,12 @@ import { ApiInterfaceRx } from '@polkadot/api/types'; import { Option, Vec } from '@polkadot/types'; import { ReferendumInfoExtended } from '../type'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { constructInfo } from './referendumInfo'; -export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable[]> { - return (ids: (BN | number)[] = []): Observable[]> => { - return ( +export const referendumInfos = memo((api: ApiInterfaceRx): (ids?: (BN | number)[]) => Observable[]> => { + return memo((ids: (BN | number)[] = []): Observable[]> => + ( !ids || !ids.length ? of([] as Option[]) : api.query.democracy.referendumInfoOf.multi(ids) as Observable>> @@ -27,6 +27,5 @@ export function referendumInfos (api: ApiInterfaceRx): (ids?: (BN | number)[]) = ) ), drr() - ); - }; -} + )); +}, true); diff --git a/packages/api-derive/src/democracy/referendumVotesFor.ts b/packages/api-derive/src/democracy/referendumVotesFor.ts index acf8762933..fdead2e214 100644 --- a/packages/api-derive/src/democracy/referendumVotesFor.ts +++ b/packages/api-derive/src/democracy/referendumVotesFor.ts @@ -11,15 +11,15 @@ import { ApiInterfaceRx } from '@polkadot/api/types'; import { Vec, createType } from '@polkadot/types'; import { DerivedBalances, DerivedReferendumVote } from '../types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { votes } from './votes'; import { votingBalances } from '../balances/votingBalances'; -export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | number) => Observable { +export const referendumVotesFor = memo((api: ApiInterfaceRx): (referendumId: BN | number) => Observable => { const votesCall = votes(api); const votingBalancesCall = votingBalances(api); - return (referendumId: BN | number): Observable => + return memo((referendumId: BN | number): Observable => api.query.democracy.votersFor>(referendumId).pipe( switchMap((votersFor): Observable<[Vec, Vote[], DerivedBalances[]]> => combineLatest([ @@ -36,5 +36,5 @@ export function referendumVotesFor (api: ApiInterfaceRx): (referendumId: BN | nu } as unknown as DerivedReferendumVote)) ), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/democracy/referendums.ts b/packages/api-derive/src/democracy/referendums.ts index edccf12e03..327b9ef991 100644 --- a/packages/api-derive/src/democracy/referendums.ts +++ b/packages/api-derive/src/democracy/referendums.ts @@ -11,13 +11,13 @@ import { ApiInterfaceRx } from '@polkadot/api/types'; import { Option } from '@polkadot/types'; import { ReferendumInfoExtended } from '../type'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { referendumInfos } from './referendumInfos'; -export function referendums (api: ApiInterfaceRx): () => Observable[]> { +export const referendums = memo((api: ApiInterfaceRx): () => Observable[]> => { const referendumInfosCall = referendumInfos(api); - return (): Observable[]> => + return memo((): Observable[]> => api.queryMulti<[ReferendumIndex, ReferendumIndex]>([ api.query.democracy.nextTally, api.query.democracy.referendumCount @@ -32,5 +32,5 @@ export function referendums (api: ApiInterfaceRx): () => Observable Observable { - return (referendumId: BN, accountIds: AccountId[] = []): Observable => { - return (( +export const votes = memo((api: ApiInterfaceRx): (referendumId: BN, accountIds?: AccountId[]) => Observable => { + return memo((referendumId: BN, accountIds: AccountId[] = []): Observable => + ( !accountIds || !accountIds.length - ? of([]) - : api.query.democracy.voteOf.multi( + ? of([] as Vote[]) + : api.query.democracy.voteOf.multi( accountIds.map((accountId): [BN, AccountId] => [referendumId, accountId] ) ) - ) as Observable>).pipe(drr()); - }; -} + ).pipe(drr())); +}, true); diff --git a/packages/api-derive/src/elections/approvalsOf.ts b/packages/api-derive/src/elections/approvalsOf.ts index 8893438d53..5519f23ccc 100644 --- a/packages/api-derive/src/elections/approvalsOf.ts +++ b/packages/api-derive/src/elections/approvalsOf.ts @@ -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 } from '../util'; +import { drr, memo } from '../util'; /** * @name approvalsOf @@ -23,8 +23,8 @@ import { drr } from '../util'; * }); * ``` */ -export function approvalsOf (api: ApiInterfaceRx): (who: AccountId) => Observable { - return (who: AccountId | string): Observable => +export const approvalsOf = memo((api: ApiInterfaceRx): (who: AccountId) => Observable => { + return memo((who: AccountId | string): Observable => api.query.elections.nextVoterSet().pipe( switchMap((nextVoterSet: SetIndex): Observable[]> => api.query.elections.approvalsOf.multi( @@ -39,5 +39,5 @@ export function approvalsOf (api: ApiInterfaceRx): (who: AccountId) => Observabl ) ), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/elections/approvalsOfAt.ts b/packages/api-derive/src/elections/approvalsOfAt.ts index ec4021f1e7..c7c0bb9571 100644 --- a/packages/api-derive/src/elections/approvalsOfAt.ts +++ b/packages/api-derive/src/elections/approvalsOfAt.ts @@ -11,7 +11,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types'; import { Vec } from '@polkadot/types'; import { approvalFlagsToBools } from '../util/approvalFlagsToBools'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @name approvalsOfAt @@ -25,10 +25,10 @@ import { drr } from '../util'; * }); * ``` */ -export function approvalsOfAt (api: ApiInterfaceRx): (who: AccountId, at: SetIndex) => Observable { - return (who: AccountId | string, at: SetIndex | BN | number): Observable => +export const approvalsOfAt = memo((api: ApiInterfaceRx): (who: AccountId, at: SetIndex) => Observable => { + return memo((who: AccountId | string, at: SetIndex | BN | number): Observable => api.query.elections.approvalsOf>([who.toString(), at]).pipe( map((flags: Vec): boolean[] => approvalFlagsToBools(flags)), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/elections/info.ts b/packages/api-derive/src/elections/info.ts index dca1141a73..1142f8f5e2 100644 --- a/packages/api-derive/src/elections/info.ts +++ b/packages/api-derive/src/elections/info.ts @@ -11,7 +11,7 @@ import { ApiInterfaceRx } from '@polkadot/api/types'; import { createType, Vec, u32 } from '@polkadot/types'; import { DerivedElectionsInfo } from '../types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; type ResultElectionsInner = [u32, u32, Vec<[AccountId, BlockNumber] & Codec>, SetIndex, BlockNumber, VoteIndex, SetIndex]; type ResultElections = [Vec, ResultElectionsInner]; @@ -42,7 +42,7 @@ function queryElections (api: ApiInterfaceRx): Observable api.query.elections.voteCount, api.query.elections.voterCount ]) - ]).pipe(map(deriveElections), drr()); + ]).pipe(map(deriveElections)); } function derivePhragmen (candidates: Vec, members: Vec<[AccountId, Balance] & Codec>, candidacyBond: Balance, desiredSeats: u32, termDuration: BlockNumber, votingBond: Balance): DerivedElectionsInfo { @@ -71,8 +71,7 @@ function queryPhragmen (api: ApiInterfaceRx): Observable { api.consts.electionsPhragmen.desiredMembers as u32, api.consts.electionsPhragmen.termDuration as BlockNumber, api.consts.electionsPhragmen.votingBond as Balance - )), - drr() + )) ); } @@ -89,9 +88,11 @@ function queryPhragmen (api: ApiInterfaceRx): Observable { * }); * ``` */ -export function info (api: ApiInterfaceRx): () => Observable { - return (): Observable => - api.query.electionsPhragmen - ? queryPhragmen(api) - : queryElections(api); -} +export const info = memo((api: ApiInterfaceRx): () => Observable => { + const query = api.query.electionsPhragmen + ? queryPhragmen + : queryElections; + + return memo((): Observable => + query(api).pipe(drr())); +}, true); diff --git a/packages/api-derive/src/elections/voterPositions.ts b/packages/api-derive/src/elections/voterPositions.ts index a734cfee14..902c8d09fa 100644 --- a/packages/api-derive/src/elections/voterPositions.ts +++ b/packages/api-derive/src/elections/voterPositions.ts @@ -11,7 +11,7 @@ import BN from 'bn.js'; import { of, combineLatest, Observable } from 'rxjs'; import { switchMap, map } from 'rxjs/operators'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @name voterPositions @@ -26,8 +26,8 @@ import { drr } from '../util'; * }); * ``` */ -export function voterPositions (api: ApiInterfaceRx): () => Observable { - return (): Observable => +export const voterPositions = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => api.query.elections.nextVoterSet().pipe( switchMap((nextVoterSet: SetIndex): Observable<[BN, Vec>[]]> => combineLatest( of(api.consts.elections.voterSetSize) as any as Observable, @@ -54,5 +54,5 @@ export function voterPositions (api: ApiInterfaceRx): () => Observable Observable> { +export const voters = memo((api: ApiInterfaceRx): () => Observable> => { const voterPositionsCall = voterPositions(api); - return (): Observable> => + return memo((): Observable> => voterPositionsCall().pipe( map((voterPositions: DerivedVoterPositions): Vec => createType( @@ -39,5 +39,5 @@ export function voters (api: ApiInterfaceRx): () => Observable> { ) ), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/imOnline/receivedHeartbeats.ts b/packages/api-derive/src/imOnline/receivedHeartbeats.ts index 5dd069e6e7..aaa7e02059 100644 --- a/packages/api-derive/src/imOnline/receivedHeartbeats.ts +++ b/packages/api-derive/src/imOnline/receivedHeartbeats.ts @@ -11,16 +11,16 @@ import { ApiInterfaceRx } from '@polkadot/api/types'; import { Bytes, Option, u32 } from '@polkadot/types'; import { overview as stakingOverview } from '../staking'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @description Return a boolean array indicating whether the passed accounts had received heartbeats in the current session */ -export function receivedHeartbeats (api: ApiInterfaceRx): () => Observable { +export const receivedHeartbeats = memo((api: ApiInterfaceRx): () => Observable => { const stakingOverviewvCall = stakingOverview(api); - return (): Observable => { - return api.query.imOnline && api.query.imOnline.receivedHeartbeats && api.query.imOnline.authoredBlocks + return memo((): Observable => + api.query.imOnline && api.query.imOnline.receivedHeartbeats && api.query.imOnline.authoredBlocks ? stakingOverviewvCall().pipe( switchMap(({ currentIndex, validators }): Observable<[AccountId[], Option[], u32[]]> => combineLatest([ @@ -41,6 +41,5 @@ export function receivedHeartbeats (api: ApiInterfaceRx): () => Observable Observable { +export const eraLength = memo((api: ApiInterfaceRx): () => Observable => { const infoCall = info(api); - return (): Observable => + return memo((): Observable => infoCall().pipe( map(({ eraLength }): BlockNumber => eraLength), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/session/eraProgress.ts b/packages/api-derive/src/session/eraProgress.ts index 7f790219f9..fed6a651b5 100644 --- a/packages/api-derive/src/session/eraProgress.ts +++ b/packages/api-derive/src/session/eraProgress.ts @@ -8,15 +8,15 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { info } from './info'; -export function eraProgress (api: ApiInterfaceRx): () => Observable { +export const eraProgress = memo((api: ApiInterfaceRx): () => Observable => { const infoCall = info(api); - return (): Observable => + return memo((): Observable => infoCall().pipe( map(({ eraProgress }): BlockNumber => eraProgress), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/session/indexes.ts b/packages/api-derive/src/session/indexes.ts index 199a358a24..9d22c58110 100644 --- a/packages/api-derive/src/session/indexes.ts +++ b/packages/api-derive/src/session/indexes.ts @@ -10,10 +10,10 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { u32 } from '@polkadot/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; -export function indexes (api: ApiInterfaceRx): () => Observable { - return (): Observable => +export const indexes = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => api.queryMulti<[SessionIndex, EraIndex, u32]>([ api.query.session.currentIndex, api.query.staking.currentEra, @@ -23,5 +23,5 @@ export function indexes (api: ApiInterfaceRx): () => Observable Observable { +export const info = memo((api: ApiInterfaceRx): () => Observable => { const calls = { bestNumberCall: bestNumber(api), indexesCall: indexes(api) @@ -138,6 +138,6 @@ export function info (api: ApiInterfaceRx): () => Observable : infoLatestAura // 2.x with Aura (not all info there) : infoV1; - return (): Observable => - query(api, calls).pipe(drr()); -} + return memo((): Observable => + query(api, calls).pipe(drr())); +}, true); diff --git a/packages/api-derive/src/session/sessionProgress.ts b/packages/api-derive/src/session/sessionProgress.ts index eded8c991a..861011537d 100644 --- a/packages/api-derive/src/session/sessionProgress.ts +++ b/packages/api-derive/src/session/sessionProgress.ts @@ -8,15 +8,15 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ApiInterfaceRx } from '@polkadot/api/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { info } from './info'; -export function sessionProgress (api: ApiInterfaceRx): () => Observable { +export const sessionProgress = memo((api: ApiInterfaceRx): () => Observable => { const infoCall = info(api); - return (): Observable => + return memo((): Observable => infoCall().pipe( map(({ sessionProgress }): BlockNumber => sessionProgress), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/staking/controllers.ts b/packages/api-derive/src/staking/controllers.ts index 438c0edcea..c4c1174b14 100644 --- a/packages/api-derive/src/staking/controllers.ts +++ b/packages/api-derive/src/staking/controllers.ts @@ -10,13 +10,13 @@ import { Observable, combineLatest, of } from 'rxjs'; import { switchMap } from 'rxjs/operators'; import { Option } from '@polkadot/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; /** * @description From the list of stash accounts, retrieve the list of controllers */ -export function controllers (api: ApiInterfaceRx): () => Observable<[AccountId[], Option[]]> { - return (): Observable<[AccountId[], Option[]]> => +export const controllers = memo((api: ApiInterfaceRx): () => Observable<[AccountId[], Option[]]> => { + return memo((): Observable<[AccountId[], Option[]]> => api.query.staking.validators<[AccountId[]] & Codec>().pipe( switchMap(([stashIds]): Observable<[AccountId[], Option[]]> => combineLatest([ @@ -28,5 +28,5 @@ export function controllers (api: ApiInterfaceRx): () => Observable<[AccountId[] ]) ), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/staking/info.ts b/packages/api-derive/src/staking/info.ts index c75bc1dac1..23561d5aee 100644 --- a/packages/api-derive/src/staking/info.ts +++ b/packages/api-derive/src/staking/info.ts @@ -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 } from '../util'; +import { drr, memo } from '../util'; interface Calls { bestNumberCall (): Observable; @@ -203,8 +203,7 @@ function retrieveV1 (api: ApiInterfaceRx, calls: Calls, controllerId: AccountId) stakingLedger.isSome ? retrieveInfoV1(api, calls, controllerId, stakingLedger.unwrap().stash, controllerId) : of({ accountId: controllerId, nextSessionIds: [], sessionIds: [] }) - ), - drr() + ) ); } @@ -216,26 +215,23 @@ function retrieveV2 (api: ApiInterfaceRx, calls: Calls, stashId: AccountId): Obs controllerId.isSome ? retrieveInfoV2(api, calls, stashId, stashId, controllerId.unwrap()) : of({ accountId: stashId, nextSessionIds: [], sessionIds: [] }) - ), - drr() + ) ); } /** * @description From a stash, retrieve the controllerId and fill in all the relevant staking details */ -export function info (api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable { +export const info = memo((api: ApiInterfaceRx): (_accountId: Uint8Array | string) => Observable => { const calls = { eraLengthCall: eraLength(api), bestNumberCall: bestNumber(api), recentlyOfflineCall: recentlyOffline(api) }; + const query = api.consts.session + ? retrieveV2 + : retrieveV1; - return (_accountId: Uint8Array | string): Observable => { - const accountId = createType('AccountId', _accountId); - - return api.consts.session - ? retrieveV2(api, calls, accountId) - : retrieveV1(api, calls, accountId); - }; -} + return memo((accountId: Uint8Array | string): Observable => + query(api, calls, createType('AccountId', accountId)).pipe(drr())); +}, true); diff --git a/packages/api-derive/src/staking/infoStash.ts b/packages/api-derive/src/staking/infoStash.ts index d5ae594c4e..c74288e34c 100644 --- a/packages/api-derive/src/staking/infoStash.ts +++ b/packages/api-derive/src/staking/infoStash.ts @@ -11,7 +11,7 @@ import { Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { Option, Vec } from '@polkadot/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; // NOTE Unused ATM, preparing for V2-only @@ -52,14 +52,14 @@ function retrieveV2 (api: ApiInterfaceRx, stashId: AccountId): Observable Observable { +export const infoStash = memo((api: ApiInterfaceRx): (stashId: AccountId) => Observable => { const query = api.consts.session ? retrieveV2 : retrieveV1; - return (stashId: AccountId): Observable => + return memo((stashId: AccountId): Observable => query(api, stashId).pipe( map((result): DerivedStakingStash => parse(stashId, result)), drr() - ); -} + )); +}, true); diff --git a/packages/api-derive/src/staking/overview.ts b/packages/api-derive/src/staking/overview.ts index 9a8dcba7b2..c59603cf47 100644 --- a/packages/api-derive/src/staking/overview.ts +++ b/packages/api-derive/src/staking/overview.ts @@ -10,16 +10,16 @@ import { Observable, combineLatest, of } from 'rxjs'; import { map, switchMap } from 'rxjs/operators'; import { createType, Vec } from '@polkadot/types'; -import { drr } from '../util'; +import { drr, memo } from '../util'; import { indexes as sessionIndexes } from '../session'; /** * @description Retrieve the staking overview, including elected and points earned */ -export function overview (api: ApiInterfaceRx): () => Observable { +export const overview = memo((api: ApiInterfaceRx): () => Observable => { const sessionIndexesCall = sessionIndexes(api); - return (): Observable => + return memo((): Observable => combineLatest([ sessionIndexesCall(), api.queryMulti<[Vec, Vec]>([ @@ -40,5 +40,5 @@ export function overview (api: ApiInterfaceRx): () => Observable Observable { - return (): Observable => +export const recentlyOffline = memo((api: ApiInterfaceRx): () => Observable => { + return memo((): Observable => ( // TODO recentlyOffline has been dropped for 2.x and replaced, figure out the // replacement as actually use and implement it @@ -46,5 +46,5 @@ export function recentlyOffline (api: ApiInterfaceRx): () => Observable Observable { +export const validators = memo((api: ApiInterfaceRx): () => Observable => { const overviewCall = overview(api); - return (): Observable => + return memo((): Observable => overviewCall().pipe( map(({ validators }): AccountId[] => validators), drr() - ); -} + )); +}, true);