Adjust multi to infer return types (#4002)

* Adjust multi to infer return types

* some linting

* Additional

* Dedupe

Author: jacogr

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

@@ -113,8 +113,8 @@ export function hasIdentityMulti (instanceId: string, api: ApiInterfaceRx): (acc
   return memo(instanceId, (accountIds: (AccountId | Uint8Array | string)[]): Observable<DeriveHasIdentity[]> =>
     api.query.identity?.identityOf
       ? combineLatest([
-        api.query.identity.identityOf.multi<Option<Registration>>(accountIds),
-        api.query.identity.superOf.multi<Option<ITuple<[AccountId, Data]>>>(accountIds)
+        api.query.identity.identityOf.multi(accountIds),
+        api.query.identity.superOf.multi(accountIds)
       ]).pipe(
         map(([identities, supers]) =>
           identities.map((identityOfOpt, index): DeriveHasIdentity => {

packages/api-derive/src/bounties/bounties.ts

@@ -4,15 +4,16 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Bytes, Option } from '@polkadot/types';
-import type { Bounty, BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
+import type { BountyIndex, ProposalIndex } from '@polkadot/types/interfaces';
+import type { PalletBountiesBounty } from '@polkadot/types/lookup';
 import type { DeriveBounties, DeriveCollectiveProposal } from '../types';
 
 import { combineLatest, map, of, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 import { filterBountiesProposals } from './helpers/filterBountyProposals';
 
-type Result = [Option<Bounty>[], Option<Bytes>[], BountyIndex[], DeriveCollectiveProposal[]];
+type Result = [Option<PalletBountiesBounty>[], Option<Bytes>[], BountyIndex[], DeriveCollectiveProposal[]];
 
 function parseResult ([maybeBounties, maybeDescriptions, ids, bountyProposals]: Result): DeriveBounties {
   const bounties: DeriveBounties = [];
@@ -53,8 +54,8 @@ export function bounties (instanceId: string, api: ApiInterfaceRx): () => Observ
         const ids = keys.map(({ args: [id] }) => id);
 
         return combineLatest([
-          bountyBase.bounties.multi<Option<Bounty>>(ids),
-          bountyBase.bountyDescriptions.multi<Option<Bytes>>(ids),
+          bountyBase.bounties.multi(ids),
+          bountyBase.bountyDescriptions.multi(ids),
           of(ids),
           of(filterBountiesProposals(api, proposals))
         ]);

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

@@ -40,9 +40,6 @@ function _proposalsFrom (instanceId: string, api: ApiInterfaceRx, section: strin
         // however we have had cases on Edgeware where the indices have moved around after an
         // upgrade, which results in invalid on-chain data
         combineLatest(hashes.map((hash) =>
-          // this should simply be api.query[section].proposalOf.multi<Option<Proposal>>(hashes),
-          // however we have had cases on Edgeware where the indices have moved around after an
-          // upgrade, which results in invalid on-chain data
           api.query[section].proposalOf<Option<Proposal>>(hash).pipe(
             catchError(() => of(null))
           )

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

@@ -3,8 +3,9 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option, u64, Vec } from '@polkadot/types';
-import type { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
+import type { Option, Vec } from '@polkadot/types';
+import type { BlockNumber, Hash, ReferendumIndex } from '@polkadot/types/interfaces';
+import type { PalletSchedulerScheduledV2 } from '@polkadot/types/lookup';
 import type { ITuple } from '@polkadot/types/types';
 import type { DeriveDispatch, DeriveProposalImage } from '../types';
 
@@ -42,7 +43,7 @@ function queryQueue (api: ApiInterfaceRx): Observable<DeriveDispatch[]> {
   );
 }
 
-function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], (Option<Scheduled>[] | null)[]]> {
+function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], (Option<PalletSchedulerScheduledV2>[] | null)[]]> {
   // We don't get entries, but rather we get the keys (triggered via finished referendums) and
   // the subscribe to those keys - this means we pickup when the schedulers actually executes
   // at a block, the entry for that block will become empty
@@ -56,11 +57,11 @@ function schedulerEntries (api: ApiInterfaceRx): Observable<[BlockNumber[], (Opt
       return blockNumbers.length
         ? combineLatest([
           of(blockNumbers),
-          // this should simply be api.query.scheduler.agenda.multi<Vec<Option<Scheduled>>>,
+          // this should simply be api.query.scheduler.agenda.multi,
           // however we have had cases on Darwinia where the indices have moved around after an
           // upgrade, which results in invalid on-chain data
           combineLatest(blockNumbers.map((blockNumber) =>
-            api.query.scheduler.agenda<Vec<Option<Scheduled>>>(blockNumber).pipe(
+            api.query.scheduler.agenda(blockNumber).pipe(
               // this does create an issue since it discards all at that block
               catchError(() => of(null))
             )
@@ -86,7 +87,7 @@ function queryScheduler (api: ApiInterfaceRx): Observable<DeriveDispatch[]> {
               const id = scheduled.maybeId.unwrap().toHex();
 
               if (id.startsWith(DEMOCRACY_ID)) {
-                const [, index] = api.registry.createType<ITuple<[u64, ReferendumIndex]>>('(u64, ReferendumIndex)', id);
+                const [, index] = api.registry.createType('(u64, ReferendumIndex)', id);
                 const imageHash = scheduled.call.args[0] as Hash;
 
                 result.push({ at, imageHash, index });

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

@@ -3,8 +3,8 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option } from '@polkadot/types';
-import type { AccountId, ReferendumInfo, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
+import type { AccountId, ReferendumInfoFinished, ReferendumInfoTo239, Vote, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
+import type { PalletDemocracyReferendumInfo } from '@polkadot/types/lookup';
 import type { BN } from '@polkadot/util';
 import type { DeriveDemocracyLock } from '../types';
 
@@ -25,7 +25,7 @@ function parseEnd (api: ApiInterfaceRx, vote: Vote, { approved, end }: Referendu
   ];
 }
 
-function parseLock (api: ApiInterfaceRx, [referendumId, accountVote]: VotingDirectVote, referendum: ReferendumInfo): DeriveDemocracyLock {
+function parseLock (api: ApiInterfaceRx, [referendumId, accountVote]: VotingDirectVote, referendum: PalletDemocracyReferendumInfo): DeriveDemocracyLock {
   const { balance, vote } = accountVote.asStandard;
   const [referendumEnd, unlockAt] = referendum.isFinished
     ? parseEnd(api, vote, referendum.asFinished)
@@ -57,13 +57,13 @@ function directLocks (api: ApiInterfaceRx, { votes }: VotingDirect): Observable<
     return of([]);
   }
 
-  return api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo | ReferendumInfoTo239>>(votes.map(([referendumId]) => referendumId)).pipe(
+  return api.query.democracy.referendumInfoOf.multi(votes.map(([referendumId]) => referendumId)).pipe(
     map((referendums) =>
       votes
-        .map((vote, index): [VotingDirectVote, ReferendumInfo | ReferendumInfoTo239 | null] =>
+        .map((vote, index): [VotingDirectVote, PalletDemocracyReferendumInfo | ReferendumInfoTo239 | null] =>
           [vote, referendums[index].unwrapOr(null)]
         )
-        .filter((item): item is [VotingDirectVote, ReferendumInfo] =>
+        .filter((item): item is [VotingDirectVote, PalletDemocracyReferendumInfo] =>
           !!item[1] && isUndefined((item[1] as ReferendumInfoTo239).end) && item[0][1].isStandard
         )
         .map(([directVote, referendum]) =>

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

@@ -3,22 +3,18 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Bytes, Option } from '@polkadot/types';
-import type { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
-import type { ITuple } from '@polkadot/types/types';
+import type { Hash } from '@polkadot/types/interfaces';
 import type { DeriveProposalImage } from '../types';
 
 import { map, of } from 'rxjs';
 
 import { memo } from '../util';
 import { parseImage } from './util';
 
-type PreImage = Option<ITuple<[Bytes, AccountId, Balance, BlockNumber]>>;
-
 export function preimages (instanceId: string, api: ApiInterfaceRx): (hashes: Hash[]) => Observable<(DeriveProposalImage | undefined)[]> {
   return memo(instanceId, (hashes: Hash[]): Observable<(DeriveProposalImage | undefined)[]> =>
     hashes.length
-      ? api.query.democracy.preimages.multi<PreImage>(hashes).pipe(
+      ? api.query.democracy.preimages.multi(hashes).pipe(
         map((images): (DeriveProposalImage | undefined)[] =>
           images.map((imageOpt) => parseImage(api, imageOpt))
         )

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

@@ -58,9 +58,9 @@ export function proposals (instanceId: string, api: ApiInterfaceRx): () => Obser
             ? combineLatest([
               of(proposals),
               api.derive.democracy.preimages(
-                proposals.map(([, hash]): Hash => hash)),
-              api.query.democracy.depositOf.multi<Depositors>(
-                proposals.map(([index]): PropIndex => index))
+                proposals.map(([, hash]) => hash)),
+              api.query.democracy.depositOf.multi(
+                proposals.map(([index]) => index))
             ])
             : of<Result>([[], [], []])
         ),

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

@@ -3,23 +3,24 @@
 
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
-import type { Option } from '@polkadot/types';
-import type { ReferendumInfo, ReferendumInfoFinished } from '@polkadot/types/interfaces';
+import type { PalletDemocracyReferendumInfo } from '@polkadot/types/lookup';
 
 import { map, switchMap } from 'rxjs';
 
 import { memo } from '../util';
 
+type ReferendumInfoFinished = PalletDemocracyReferendumInfo['asFinished'];
+
 export function referendumsFinished (instanceId: string, api: ApiInterfaceRx): () => Observable<ReferendumInfoFinished[]> {
   return memo(instanceId, (): Observable<ReferendumInfoFinished[]> =>
     api.derive.democracy.referendumIds().pipe(
       switchMap((ids) =>
-        api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo>>(ids)
+        api.query.democracy.referendumInfoOf.multi(ids)
       ),
       map((infos): ReferendumInfoFinished[] =>
         infos
           .map((optInfo) => optInfo.unwrapOr(null))
-          .filter((info): info is ReferendumInfo => !!info && info.isFinished)
+          .filter((info): info is PalletDemocracyReferendumInfo => !!info && info.isFinished)
           .map((info) => info.asFinished)
       )
     )

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

@@ -4,7 +4,8 @@
 import type { Observable } from 'rxjs';
 import type { ApiInterfaceRx } from '@polkadot/api/types';
 import type { Option, Vec } from '@polkadot/types';
-import type { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDelegating, VotingDirectVote } from '@polkadot/types/interfaces';
+import type { AccountId, ReferendumInfoTo239, Vote, Voting, VotingDelegating, VotingDirectVote } from '@polkadot/types/interfaces';
+import type { PalletDemocracyReferendumInfo } from '@polkadot/types/lookup';
 import type { BN } from '@polkadot/util';
 import type { DeriveBalancesAccount, DeriveReferendum, DeriveReferendumVote, DeriveReferendumVotes } from '../types';
 
@@ -123,8 +124,8 @@ export function _referendumsVotes (instanceId: string, api: ApiInterfaceRx): (re
   );
 }
 
-export function _referendumInfo (instanceId: string, api: ApiInterfaceRx): (index: BN, info: Option<ReferendumInfo | ReferendumInfoTo239>) => Observable<DeriveReferendum | null> {
-  return memo(instanceId, (index: BN, info: Option<ReferendumInfo | ReferendumInfoTo239>): Observable<DeriveReferendum | null> => {
+export function _referendumInfo (instanceId: string, api: ApiInterfaceRx): (index: BN, info: Option<PalletDemocracyReferendumInfo | ReferendumInfoTo239>) => Observable<DeriveReferendum | null> {
+  return memo(instanceId, (index: BN, info: Option<PalletDemocracyReferendumInfo | ReferendumInfoTo239>): Observable<DeriveReferendum | null> => {
     const status = getStatus(info);
 
     return status
@@ -143,7 +144,7 @@ export function _referendumInfo (instanceId: string, api: ApiInterfaceRx): (inde
 export function referendumsInfo (instanceId: string, api: ApiInterfaceRx): (ids: BN[]) => Observable<DeriveReferendum[]> {
   return memo(instanceId, (ids: BN[]): Observable<DeriveReferendum[]> =>
     ids.length
-      ? api.query.democracy.referendumInfoOf.multi<Option<ReferendumInfo>>(ids).pipe(
+      ? api.query.democracy.referendumInfoOf.multi(ids).pipe(
         switchMap((infos): Observable<(DeriveReferendum | null)[]> =>
           combineLatest(
             ids.map((id, index): Observable<DeriveReferendum | null> =>

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

@@ -2,7 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { Vec } from '@polkadot/types';
-import type { AccountId, Balance, BlockNumber, Hash, PropIndex, Proposal, ReferendumIndex, ReferendumInfoTo239, ReferendumStatus, Vote, VoteThreshold } from '@polkadot/types/interfaces';
+import type { AccountId, Balance, BlockNumber, Hash, PropIndex, Proposal, ReferendumIndex, ReferendumInfoTo239, Vote, VoteThreshold } from '@polkadot/types/interfaces';
+import type { PalletDemocracyReferendumStatus } from '@polkadot/types/lookup';
 import type { BN } from '@polkadot/util';
 
 export interface DeriveDemocracyLock {
@@ -48,7 +49,7 @@ export interface DeriveReferendum {
   index: ReferendumIndex;
   image?: DeriveProposalImage;
   imageHash: Hash;
-  status: ReferendumStatus | ReferendumInfoTo239;
+  status: PalletDemocracyReferendumStatus | ReferendumInfoTo239;
 }
 
 export interface DeriveReferendumVote {