From fa9a982ebaf39a1ebdd1f2be138794fb7f7afbd7 Mon Sep 17 00:00:00 2001
From: Jaco <jacogr@gmail.com>
Date: Mon, 3 May 2021 20:07:37 +0300
Subject: [PATCH] Adjust for Westend paras naming (#5197)

---
 packages/page-parachains/src/Auctions/Bid.tsx        |  2 +-
 packages/page-parachains/src/Auctions/Summary.tsx    |  2 +-
 packages/page-parachains/src/Overview/Parachain.tsx  | 12 ++++++------
 packages/page-parachains/src/Overview/Parachains.tsx | 10 +++++-----
 packages/page-parachains/src/useAuctionInfo.tsx      |  4 ++--
 packages/page-parachains/src/useFunds.ts             |  6 +++---
 packages/page-parachains/src/useHrmp.ts              |  9 ++++++---
 packages/page-parachains/src/useRanges.ts            |  2 +-
 packages/page-parachains/src/useWinningData.ts       |  6 +++---
 9 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/packages/page-parachains/src/Auctions/Bid.tsx b/packages/page-parachains/src/Auctions/Bid.tsx
index 8f30aaee00..0ad636e9f2 100644
--- a/packages/page-parachains/src/Auctions/Bid.tsx
+++ b/packages/page-parachains/src/Auctions/Bid.tsx
@@ -75,7 +75,7 @@ function Bid ({ auctionInfo, className, lastWinners, ownedIds }: Props): React.R
     <>
       <Button
         icon='plus'
-        isDisabled={!ownedIds.length || !hasAccounts || !auctionInfo?.numAuctions || !auctionInfo.leasePeriod || !auctionInfo.endBlock || bestNumber?.gte(auctionInfo.endBlock.add(api.consts.auctions.endingPeriod as BlockNumber))}
+        isDisabled={!ownedIds.length || !hasAccounts || !auctionInfo?.numAuctions || !auctionInfo.leasePeriod || !auctionInfo.endBlock || !api.consts.auctions || bestNumber?.gte(auctionInfo.endBlock.add(api.consts.auctions.endingPeriod as BlockNumber))}
         label={t<string>('Bid')}
         onClick={toggleOpen}
       />
diff --git a/packages/page-parachains/src/Auctions/Summary.tsx b/packages/page-parachains/src/Auctions/Summary.tsx
index ce4662d854..6c3f4627af 100644
--- a/packages/page-parachains/src/Auctions/Summary.tsx
+++ b/packages/page-parachains/src/Auctions/Summary.tsx
@@ -83,7 +83,7 @@ function Summary ({ auctionInfo, className, lastWinners }: Props): React.ReactEl
                   <CardSummary
                     label={t<string>('ending period')}
                     progress={{
-                      total: api.consts.auctions.endingPeriod as BlockNumber,
+                      total: api.consts.auctions?.endingPeriod as BlockNumber,
                       value: bestNumber.sub(auctionInfo.endBlock),
                       withTime: true
                     }}
diff --git a/packages/page-parachains/src/Overview/Parachain.tsx b/packages/page-parachains/src/Overview/Parachain.tsx
index a1c06ca916..cfe2cc37f8 100644
--- a/packages/page-parachains/src/Overview/Parachain.tsx
+++ b/packages/page-parachains/src/Overview/Parachain.tsx
@@ -103,12 +103,12 @@ function Parachain ({ bestNumber, channelDst, channelSrc, className = '', id, la
     [api.query.paras.heads, id],
     [api.query.paras.futureCodeUpgrades, id],
     [api.query.paras.paraLifecycles, id],
-    [api.query.dmp.downwardMessageQueues, id],
-    [api.query.ump.relayDispatchQueues, id],
-    [api.query.hrmp.hrmpEgressChannelsIndex, id],
-    [api.query.hrmp.hrmpIngressChannelsIndex, id],
-    [api.query.hrmp.hrmpWatermarks, id],
-    [api.query.inclusion.pendingAvailability, id],
+    [(api.query.parasDmp || api.query.dmp)?.downwardMessageQueues, id],
+    [(api.query.parasUmp || api.query.ump)?.relayDispatchQueues, id],
+    [(api.query.parasHrmp || api.query.hrmp)?.hrmpEgressChannelsIndex, id],
+    [(api.query.parasHrmp || api.query.hrmp)?.hrmpIngressChannelsIndex, id],
+    [(api.query.parasHrmp || api.query.hrmp)?.hrmpWatermarks, id],
+    [(api.query.parasInclusion || api.query.inclusion)?.pendingAvailability, id],
     [api.query.registrar.paras, id],
     [api.query.slots.leases, id]
   ], optionsMulti);
diff --git a/packages/page-parachains/src/Overview/Parachains.tsx b/packages/page-parachains/src/Overview/Parachains.tsx
index 374063f729..59a3b2e310 100644
--- a/packages/page-parachains/src/Overview/Parachains.tsx
+++ b/packages/page-parachains/src/Overview/Parachains.tsx
@@ -89,13 +89,13 @@ function extractEvents (api: ApiPromise, lastBlock: SignedBlockExtended, prev: L
 
   lastBlock.events.forEach(({ event, phase }) => {
     if (phase.isApplyExtrinsic) {
-      if (api.events.inclusion.CandidateBacked.is(event)) {
+      if ((api.events.parasInclusion || api.events.inclusion)?.CandidateBacked.is(event)) {
         includeEntry(backed, event, blockHash, blockNumber);
         wasBacked = true;
-      } else if (api.events.inclusion.CandidateIncluded.is(event)) {
+      } else if ((api.events.parasInclusion || api.events.inclusion)?.CandidateIncluded.is(event)) {
         includeEntry(included, event, blockHash, blockNumber);
         wasIncluded = true;
-      } else if (api.events.inclusion.CandidateTimedOut.is(event)) {
+      } else if ((api.events.parasInclusion || api.events.inclusion)?.CandidateTimedOut.is(event)) {
         includeEntry(timeout, event, blockHash, blockNumber);
         wasTimeout = true;
       }
@@ -149,8 +149,8 @@ function Parachains ({ actionsQueue, ids, leasePeriod, scheduled }: Props): Reac
   const [{ lastBacked, lastIncluded, lastTimeout }, setLastEvents] = useState<LastEvents>(EMPTY_EVENTS);
   const [validators, validatorGroups, activeIndices] = useCallMulti<MultiResult>([
     api.query.session.validators,
-    api.query.paraScheduler?.validatorGroups || api.query.scheduler?.validatorGroups,
-    api.query.shared.activeValidatorIndices
+    (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);
diff --git a/packages/page-parachains/src/useAuctionInfo.tsx b/packages/page-parachains/src/useAuctionInfo.tsx
index 7b2df236dc..29b99c9480 100644
--- a/packages/page-parachains/src/useAuctionInfo.tsx
+++ b/packages/page-parachains/src/useAuctionInfo.tsx
@@ -24,7 +24,7 @@ export default function useAuctionInfo (): AuctionInfo | undefined {
   const { api } = useApi();
 
   return useCallMulti<AuctionInfo>([
-    api.query.auctions.auctionCounter,
-    api.query.auctions.auctionInfo
+    api.query.auctions?.auctionCounter,
+    api.query.auctions?.auctionInfo
   ], optionsMulti);
 }
diff --git a/packages/page-parachains/src/useFunds.ts b/packages/page-parachains/src/useFunds.ts
index 24a21639d1..749f4fae7b 100644
--- a/packages/page-parachains/src/useFunds.ts
+++ b/packages/page-parachains/src/useFunds.ts
@@ -166,9 +166,9 @@ function extractFundIds (keys: StorageKey<[ParaId]>[]): ParaId[] {
 export default function useFunds (): Campaigns {
   const { api } = useApi();
   const bestNumber = useBestNumber();
-  const trigger = useEventTrigger([api.events.crowdloan.Created]);
-  const paraIds = useMapKeys(api.query.crowdloan.funds, { at: trigger, transform: extractFundIds });
-  const campaigns = useCall<Campaign[]>(api.query.crowdloan.funds.multi, [paraIds], optFundMulti);
+  const trigger = useEventTrigger([api.events.crowdloan?.Created]);
+  const paraIds = useMapKeys(api.query.crowdloan?.funds, { at: trigger, transform: extractFundIds });
+  const campaigns = useCall<Campaign[]>(api.query.crowdloan?.funds.multi, [paraIds], optFundMulti);
   const leases = useCall<ParaId[]>(api.query.slots.leases.multi, [paraIds], optLeaseMulti);
   const [result, setResult] = useState<Campaigns>(EMPTY);
 
diff --git a/packages/page-parachains/src/useHrmp.ts b/packages/page-parachains/src/useHrmp.ts
index 602d7430f5..6498ed74a7 100644
--- a/packages/page-parachains/src/useHrmp.ts
+++ b/packages/page-parachains/src/useHrmp.ts
@@ -31,8 +31,11 @@ function extractChannelIds (keys: StorageKey<[HrmpChannelId]>[]): HrmpChannelId[
 
 export default function useHrmp (): AllChannels | undefined {
   const { api } = useApi();
-  const trigger = useEventTrigger([api.events.hrmp.OpenChannelAccepted, api.events.hrmp.ChannelClosed]);
-  const channelIds = useMapKeys(api.query.hrmp.hrmpChannels, { at: trigger, transform: extractChannelIds });
+  const trigger = useEventTrigger([
+    (api.events.parasHrmp || api.events.hrmp)?.OpenChannelAccepted,
+    (api.events.parasHrmp || api.events.hrmp)?.ChannelClosed
+  ]);
+  const channelIds = useMapKeys((api.query.parasHrmp || api.query.hrmp)?.hrmpChannels, { at: trigger, transform: extractChannelIds });
 
-  return useCall<AllChannels>(channelIds && api.query.hrmp.hrmpChannels.multi, [channelIds], optChannels);
+  return useCall<AllChannels>(channelIds && (api.query.parasHrmp || api.query.hrmp)?.hrmpChannels.multi, [channelIds], optChannels);
 }
diff --git a/packages/page-parachains/src/useRanges.ts b/packages/page-parachains/src/useRanges.ts
index 869838089a..74c905bda1 100644
--- a/packages/page-parachains/src/useRanges.ts
+++ b/packages/page-parachains/src/useRanges.ts
@@ -23,7 +23,7 @@ export default function useRanges (): [number, number][] {
 
   return useMemo(
     (): [number, number][] => {
-      if (isU32(api.consts.auctions.leasePeriodsPerSlot)) {
+      if (isU32(api.consts.auctions?.leasePeriodsPerSlot)) {
         const ranges: [number, number][] = [];
 
         for (let i = 0; api.consts.auctions.leasePeriodsPerSlot.gtn(i); i++) {
diff --git a/packages/page-parachains/src/useWinningData.ts b/packages/page-parachains/src/useWinningData.ts
index 5561dfac6a..3cd773d80d 100644
--- a/packages/page-parachains/src/useWinningData.ts
+++ b/packages/page-parachains/src/useWinningData.ts
@@ -126,10 +126,10 @@ export default function useWinningData (auctionInfo?: AuctionInfo): Winning[] |
   const ranges = useRanges();
   const [result, setResult] = useState<Winning[] | undefined>();
   const bestNumber = useBestNumber();
-  const trigger = useEventTrigger([api.events.auctions.BidAccepted]);
+  const trigger = useEventTrigger([api.events.auctions?.BidAccepted]);
   const triggerRef = useRef(trigger);
-  const initialEntries = useCall<[StorageKey<[BlockNumber]>, Option<WinningData>][]>(api.query.auctions.winning.entries);
-  const optFirstData = useCall<Option<WinningData>>(api.query.auctions.winning, FIRST_PARAM);
+  const initialEntries = useCall<[StorageKey<[BlockNumber]>, Option<WinningData>][]>(api.query.auctions?.winning.entries);
+  const optFirstData = useCall<Option<WinningData>>(api.query.auctions?.winning, FIRST_PARAM);
 
   // should be fired once, all entries as an initial round
   useEffect((): void => {