diff --git a/packages/api-derive/src/balances/account.ts b/packages/api-derive/src/balances/account.ts index 47a06b123d..766968d6ee 100644 --- a/packages/api-derive/src/balances/account.ts +++ b/packages/api-derive/src/balances/account.ts @@ -54,8 +54,18 @@ function queryBalancesFree (api: ApiInterfaceRx, accountId: AccountId): Observab ); } +type DeriveCustomAccount = ApiInterfaceRx['derive'] & { [custom: string]: { + customAccount?: ApiInterfaceRx['query']['balances']['account'] +} } + function queryBalancesAccount (api: ApiInterfaceRx, accountId: AccountId, modules: string[] = ['balances']): Observable { - const balances = modules.map((m): QueryableStorageMultiArg<'rxjs'> => [api.query[m].account, accountId]); + const balances = modules.map( + (m): QueryableStorageMultiArg<'rxjs'> => [ + (api.derive as DeriveCustomAccount)[m]?.customAccount ?? api.query[m].account, + accountId + ] + ); + const extract = (data: AccountData[]) => data.map(({ feeFrozen, free, miscFrozen, reserved }): BalanceResult => [free, reserved, feeFrozen, miscFrozen]); diff --git a/packages/api-derive/src/balances/all.ts b/packages/api-derive/src/balances/all.ts index 7c1629188d..ae3aa9f4a6 100644 --- a/packages/api-derive/src/balances/all.ts +++ b/packages/api-derive/src/balances/all.ts @@ -112,11 +112,21 @@ function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable(nullable: T): nullable is NonNullable => !!nullable; + +type DeriveCustomLocks = ApiInterfaceRx['derive'] & { [custom: string]: { + customLocks?: ApiInterfaceRx['query']['balances']['locks'] +} } + // current (balances, vesting) function queryCurrent (api: ApiInterfaceRx, accountId: AccountId, balanceInstances: string[] = ['balances']): Observable { - const lockCalls = balanceInstances.map((m) => api.query[m].locks); + const lockCalls = balanceInstances.map( + (m): ApiInterfaceRx['query']['balances']['locks'] | undefined => + (api.derive as DeriveCustomLocks)[m]?.customLocks ?? api.query[m as 'balances']?.locks + ); + const lockEmpty = lockCalls.map((c) => !c); - const lockQueries = lockCalls.filter((c) => c).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]); + const lockQueries = lockCalls.filter(isNonNullable).map((c): QueryableStorageMultiArg<'rxjs'> => [c, accountId]); return ( api.query.vesting?.vesting