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

Use derive customAccount and customLocks for balance overrides (#3248)

Browse Source 
* modified api-derive balances to allow use of custom balance storages via derives; current implementation only works with standard call signatures

* type predicate as filter value

* renamed derive method name
This commit is contained in:
Alex D
2021-03-01 08:42:07 +01:00
committed by GitHub
parent d1a1be49c5
commit 2afff1b41f
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/api-derive/src/balances/account.ts
+11 -1
View File
@@ -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<Result> {
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]);
packages/api-derive/src/balances/all.ts
+12 -2
View File
@@ -112,11 +112,21 @@ function queryOld (api: ApiInterfaceRx, accountId: AccountId): Observable<Result
);
}
const isNonNullable = <T>(nullable: T): nullable is NonNullable<T> => !!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<ResultBalance> {
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