From 533edbb8d78512f6ffc4df650fcbad278f8b833b Mon Sep 17 00:00:00 2001 From: Jaco Date: Mon, 23 May 2022 07:58:49 +0200 Subject: [PATCH] Move Polkadex endpoints (#7624) * Move Polkadex endpoints * Dummy entries * No providers with default isUnreachable * Ordering --- packages/apps-config/src/endpoints/production.ts | 3 ++- .../src/endpoints/productionRelayKusama.ts | 16 ++++++++-------- .../src/endpoints/productionRelayPolkadot.ts | 3 ++- packages/apps-config/src/endpoints/util.ts | 11 +++++++++-- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/packages/apps-config/src/endpoints/production.ts b/packages/apps-config/src/endpoints/production.ts index 4b40f5a796..0622410707 100644 --- a/packages/apps-config/src/endpoints/production.ts +++ b/packages/apps-config/src/endpoints/production.ts @@ -221,7 +221,8 @@ export const prodChains: EndpointOption[] = [ info: 'polkadex', text: 'Polkadex', providers: { - 'Polkadex Team': 'wss://mainnet.polkadex.trade' + 'Polkadex Team': 'wss://mainnet.polkadex.trade', + OnFinality: 'wss://polkadex.api.onfinality.io/public-ws' } }, { diff --git a/packages/apps-config/src/endpoints/productionRelayKusama.ts b/packages/apps-config/src/endpoints/productionRelayKusama.ts index 4de732df92..bf688ef55a 100644 --- a/packages/apps-config/src/endpoints/productionRelayKusama.ts +++ b/packages/apps-config/src/endpoints/productionRelayKusama.ts @@ -326,14 +326,6 @@ export const prodParasKusama: EndpointOption[] = [ OnFinality: 'wss://robonomics.api.onfinality.io/public-ws' } }, - { - info: 'trustbase', - isUnreachable: true, // no providers (yet) - homepage: 'https://trustbase.network/', - paraId: 2078, - text: 'TrustBase', - providers: {} - }, { info: 'sakura', homepage: 'https://clover.finance/', @@ -402,6 +394,14 @@ export const prodParasKusama: EndpointOption[] = [ DataHighway: 'wss://tanganika.datahighway.com' } }, + { + info: 'trustbase', + isUnreachable: true, // no providers (yet) + homepage: 'https://trustbase.network/', + paraId: 2078, + text: 'TrustBase', + providers: {} + }, { info: 'turing', homepage: 'https://oak.tech', diff --git a/packages/apps-config/src/endpoints/productionRelayPolkadot.ts b/packages/apps-config/src/endpoints/productionRelayPolkadot.ts index 64ec21d4e5..399bb74637 100644 --- a/packages/apps-config/src/endpoints/productionRelayPolkadot.ts +++ b/packages/apps-config/src/endpoints/productionRelayPolkadot.ts @@ -254,12 +254,13 @@ export const prodParasPolkadot: EndpointOption[] = [ }, { info: 'polkadex', + isUnreachable: true, // https://github.com/polkadot-js/apps/issues/7620 homepage: 'https://polkadex.trade/', paraId: 2040, text: 'Polkadex', providers: { // 'Polkadex Team': 'wss://mainnet.polkadex.trade/', // https://github.com/polkadot-js/apps/issues/7620 - OnFinality: 'wss://polkadex.api.onfinality.io/public-ws' + // OnFinality: 'wss://polkadex.api.onfinality.io/public-ws' // https://github.com/polkadot-js/apps/issues/7620 } }, { diff --git a/packages/apps-config/src/endpoints/util.ts b/packages/apps-config/src/endpoints/util.ts index 6aaca098da..a5c23a47b0 100644 --- a/packages/apps-config/src/endpoints/util.ts +++ b/packages/apps-config/src/endpoints/util.ts @@ -8,6 +8,8 @@ interface SortOption { isUnreachable?: boolean; } +let dummyId = 0; + function sortNoop (): number { return 0; } @@ -41,20 +43,25 @@ function expandLinked (input: LinkOption[]): LinkOption[] { } function expandEndpoint (t: TFunction, { dnslink, genesisHash, homepage, info, isChild, isDisabled, isUnreachable, linked, paraId, providers, teleport, text }: EndpointOption, firstOnly: boolean, withSort: boolean): LinkOption[] { + const hasProviders = Object.keys(providers).length !== 0; const base = { genesisHash, homepage, info, isChild, isDisabled, - isUnreachable, + isUnreachable: isUnreachable || !hasProviders, paraId, teleport, text }; const result = Object - .entries(providers) + .entries( + hasProviders + ? providers + : { Placeholder: `wss://${++dummyId}` } + ) .filter((_, index) => !firstOnly || index === 0) .map(([host, value], index): LinkOption => ({ ...base,