Retrieve upcoming via actionsQueue (#4810)

* Retrieve upcoming via actionsQueue

* useEventTrigger on global & extrinsic events
This commit is contained in:
Jaco Greeff 2021-03-10 16:15:41 +01:00 committed by GitHub
parent 86c5a8423b
commit 47590a2fdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions

View File

@ -1,7 +1,7 @@
// Copyright 2017-2021 @polkadot/app-parachains authors & contributors
// SPDX-License-Identifier: Apache-2.0
import type { StorageKey } from '@polkadot/types';
import type { Vec } from '@polkadot/types';
import type { ParaId } from '@polkadot/types/interfaces';
import type { Proposals } from '../types';
@ -28,14 +28,12 @@ function Overview ({ className, proposals }: Props): React.ReactElement<Props> {
useEffect((): void => {
sessionTrigger &&
api.query.paras?.upcomingParasGenesis
?.keys()
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
.then((keys: StorageKey<[ParaId]>[]): void => {
api.query.paras?.actionsQueue
?.entries<Vec<ParaId>, [ParaId]>()
.then((entries): void => {
mountedRef.current &&
setUpcomingIds(
keys.map(({ args: [paraId] }) => paraId)
entries.reduce<ParaId[]>((all, [, ids]) => [...all, ...ids], [])
);
})
.catch(console.error);

View File

@ -14,16 +14,15 @@ import { useIsMountedRef } from './useIsMountedRef';
type EventCheck = AugmentedEvent<'promise'> | string | false | undefined | null;
export function useEventTrigger (events: EventCheck[]): number {
export function useEventTrigger (checks: EventCheck[]): number {
const { api } = useApi();
const [trigger, setTrigger] = useState(() => Date.now());
const mountedRef = useIsMountedRef();
const eventRecords = useCall<EventRecord[]>(api.query.system.events);
useEffect((): void => {
const count = eventRecords && eventRecords.filter(({ event, phase }) =>
event && phase?.isApplyExtrinsic &&
events.some((check) => check && (
const count = eventRecords && eventRecords.filter(({ event }) =>
event && checks.some((check) => check && (
isString(check)
? event.section === check
: check.is(event)
@ -31,7 +30,7 @@ export function useEventTrigger (events: EventCheck[]): number {
).length;
mountedRef.current && count && setTrigger(Date.now());
}, [eventRecords, events, mountedRef]);
}, [eventRecords, checks, mountedRef]);
return trigger;
}