neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly map validators to CoreAssignment.groupIdx (#5339)

Browse Source 
* Properly map validators to CoreAssignment.groupIdx

* Refresh adjustments
This commit is contained in:
Jaco 2021-05-21 21:15:01 +03:00 committed by GitHub
parent 202830e137
commit 2a777d1697
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
packages/page-parachains/src/Overview/Parachains.tsx
View File

@ -3,7 +3,7 @@
import type { ApiPromise } from '@polkadot/api';
import type { SignedBlockExtended } from '@polkadot/api-derive/types';
import type { AccountId, CandidateReceipt, Event, ParaId, ParaValidatorIndex } from '@polkadot/types/interfaces';
import type { AccountId, CandidateReceipt, CoreAssignment, Event, ParaId, ParaValidatorIndex } from '@polkadot/types/interfaces';
import type { IEvent } from '@polkadot/types/types';
import type { LeasePeriod, QueuedAction, ScheduledProposals } from '../types';
import type { EventMapInfo, ValidatorInfo } from './types';
@ -33,12 +33,12 @@ interface LastEvents {
lastTimeout: EventMap;
}
type MultiResult = [AccountId[] | null, ParaValidatorIndex[][] | null, ParaValidatorIndex[] | null];
type MultiResult = [AccountId[] | null, CoreAssignment[] | null, ParaValidatorIndex[][] | null, ParaValidatorIndex[] | null];
const EMPTY_EVENTS: LastEvents = { lastBacked: {}, lastIncluded: {}, lastTimeout: {} };
const optionsMulti = {
defaultValue: [null, null, null] as MultiResult
defaultValue: [null, null, null, null] as MultiResult
};
function includeEntry (map: EventMap, event: Event, blockHash: string, blockNumber: BN): void {
@ -61,20 +61,28 @@ function extractScheduledIds (scheduled: ScheduledProposals[] = []): Record<stri
}), all), {});
}
function mapValidators (ids: ParaId[] | undefined, validators: AccountId[] | null, validatorGroups: ParaValidatorIndex[][] | null, activeIndices: ParaValidatorIndex[] | null): Record<string, ValidatorInfo[]> {
return activeIndices && validators && validatorGroups && ids && (ids.length <= validatorGroups.length)
? ids.reduce((all: Record<string, ValidatorInfo[]>, id, index) => ({
...all,
[id.toString()]: validatorGroups[index]
.map((indexActive) => [indexActive, activeIndices[indexActive.toNumber()]])
.filter(([, a]) => a)
.map(([indexActive, indexValidator]) => ({
indexActive,
indexValidator,
validatorId: validators[indexValidator.toNumber()]
}))
}), {})
: {};
function mapValidators (startWith: Record<string, ValidatorInfo[]>, ids: ParaId[] | undefined, validators: AccountId[] | null, validatorGroups: ParaValidatorIndex[][] | null, activeIndices: ParaValidatorIndex[] | null, assignments: CoreAssignment[] | null): Record<string, ValidatorInfo[]> {
return assignments && activeIndices && validators && validatorGroups && ids
? ids.reduce((all: Record<string, ValidatorInfo[]>, id) => {
const assignment = assignments.find(({ paraId }) => paraId.eq(id));
if (!assignment) {
return all;
}
return {
...all,
[id.toString()]: validatorGroups[assignment.groupIdx.toNumber()]
.map((indexActive) => [indexActive, activeIndices[indexActive.toNumber()]])
.filter(([, a]) => a)
.map(([indexActive, indexValidator]) => ({
indexActive,
indexValidator,
validatorId: validators[indexValidator.toNumber()]
}))
};
}, { ...startWith })
: startWith;
}
function extractEvents (api: ApiPromise, lastBlock: SignedBlockExtended, prev: LastEvents): LastEvents {
@ -147,13 +155,15 @@ function Parachains ({ actionsQueue, ids, leasePeriod, scheduled }: Props): Reac
const bestNumber = useBestNumber();
const lastBlock = useCall<SignedBlockExtended>(api.derive.chain.subscribeNewBlocks);
const [{ lastBacked, lastIncluded, lastTimeout }, setLastEvents] = useState<LastEvents>(EMPTY_EVENTS);
const [validators, validatorGroups, activeIndices] = useCallMulti<MultiResult>([
const [validators, assignments, validatorGroups, validatorIndices] = useCallMulti<MultiResult>([
api.query.session.validators,
(api.query.parasScheduler || api.query.paraScheduler || api.query.scheduler)?.scheduled,
(api.query.parasScheduler || api.query.paraScheduler || api.query.scheduler)?.validatorGroups,
(api.query.parasShared || api.query.shared)?.activeValidatorIndices
], optionsMulti);
const hrmp = useHrmp();
const hasLinksMap = useIsParasLinked(ids);
const [validatorMap, setValidatorMap] = useState<Record<string, ValidatorInfo[]>>({});
const headerRef = useRef([
[t('parachains'), 'start', 2],
@ -174,11 +184,6 @@ function Parachains ({ actionsQueue, ids, leasePeriod, scheduled }: Props): Reac
[scheduled]
);
const validatorMap = useMemo(
() => mapValidators(ids, validators, validatorGroups, activeIndices),
[activeIndices, ids, validators, validatorGroups]
);
const knownIds = useMemo(
() => extractIds(hasLinksMap, ids),
[ids, hasLinksMap]
@ -195,6 +200,12 @@ function Parachains ({ actionsQueue, ids, leasePeriod, scheduled }: Props): Reac
);
}, [api, lastBlock]);
useEffect((): void => {
setValidatorMap((prev) =>
mapValidators(prev, ids, validators, validatorGroups, validatorIndices, assignments)
);
}, [assignments, ids, validators, validatorGroups, validatorIndices]);
return (
<Table
empty={knownIds && t<string>('There are no registered parachains')}