From b8f22763ab0fe2fd4b0663d3d4988a9763dcd9ce Mon Sep 17 00:00:00 2001 From: zzcwoshizz Date: Mon, 1 Mar 2021 15:39:25 +0800 Subject: [PATCH] feat(apps-config): jupiter & jupiter rococo (#4750) 1. add jupiter rococo config 2. update jupiter poa config --- packages/apps-config/src/api/spec/index.ts | 4 +++- .../src/api/spec/jupiter-rococo.ts | 22 +++++++++++++++++++ packages/apps-config/src/api/spec/jupiter.ts | 18 ++++++++++++++- packages/apps-config/src/endpoints/testing.ts | 4 ++-- .../src/endpoints/testingRococo.ts | 8 +++++++ packages/apps-config/src/ui/colors.ts | 5 +++-- packages/apps-config/src/ui/logos/index.ts | 5 ++++- 7 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 packages/apps-config/src/api/spec/jupiter-rococo.ts diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 011d5f9076..871ee58161 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -33,6 +33,7 @@ import hydrate from './hydrate'; import idavoll from './idavoll'; import integritee from './integritee'; import jupiter from './jupiter'; +import jupiterRococo from './jupiter-rococo'; import kilt from './kilt'; import kulupu from './kulupu'; import laminar from './laminar'; @@ -92,7 +93,8 @@ const spec: Record = { 'hydra-dx': hydrate, idavoll, 'integritee-parachain': integritee, - jupiter, + 'jupiter-prep': jupiter, + 'jupiter-rococo': jupiterRococo, 'kilt-parachain': kilt, kulupu, laminar, diff --git a/packages/apps-config/src/api/spec/jupiter-rococo.ts b/packages/apps-config/src/api/spec/jupiter-rococo.ts new file mode 100644 index 0000000000..95d2d647c1 --- /dev/null +++ b/packages/apps-config/src/api/spec/jupiter-rococo.ts @@ -0,0 +1,22 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { OverrideBundleDefinition } from '@polkadot/types/types'; + +// structs need to be in order +/* eslint-disable sort-keys */ + +const definitions: OverrideBundleDefinition = { + types: [ + { + // on all versions + minmax: [0, undefined], + types: { + LookupSource: 'MultiAddress', + Address: 'MultiAddress' + } + } + ] +}; + +export default definitions; diff --git a/packages/apps-config/src/api/spec/jupiter.ts b/packages/apps-config/src/api/spec/jupiter.ts index 4322140cb1..6d59b2ca03 100644 --- a/packages/apps-config/src/api/spec/jupiter.ts +++ b/packages/apps-config/src/api/spec/jupiter.ts @@ -12,8 +12,24 @@ const definitions: OverrideBundleDefinition = { // on all versions minmax: [0, undefined], types: { + LookupSource: 'MultiAddress', Address: 'MultiAddress', - LookupSource: 'MultiAddress' + FullIdentification: 'AccountId', + AuthorityState: { + _enum: [ + 'Working', + 'Waiting' + ] + }, + EraIndex: 'u32', + ActiveEraInfo: { + index: 'EraIndex', + start: 'Option' + }, + UnappliedSlash: { + validator: 'AccountId', + reporters: 'Vec' + } } } ] diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index 0e4d3b257c..2a0089d80c 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -141,8 +141,8 @@ export function createTesting (t: TFunction): LinkOption[] { info: 'jupiter', text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }), providers: { - Elara: 'wss://jupiter.elara.patract.io', - Patract: 'wss://ws.jupiter.patract.cn' + Elara: 'wss://jupiter-poa.elara.patract.io', + Patract: 'wss://ws.jupiter-poa.patract.cn' } }, { diff --git a/packages/apps-config/src/endpoints/testingRococo.ts b/packages/apps-config/src/endpoints/testingRococo.ts index 3d50069aca..27dba74e67 100644 --- a/packages/apps-config/src/endpoints/testingRococo.ts +++ b/packages/apps-config/src/endpoints/testingRococo.ts @@ -142,6 +142,14 @@ export function createRococo (t: TFunction): LinkOption[] { SCS: 'wss://rococo.integritee.network' } }, + { + info: 'rococoJupiter', + paraId: 1, + text: t('rpc.rococo.jupiter', 'Patract Jupiter R1', { ns: 'apps-config' }), + providers: { + jupiter: 'wss://ws.rococo.jupiter.patract.cn' + } + }, { info: 'rococoKilt', paraId: 12623, diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts index 6750eb9825..e87a7d93c1 100644 --- a/packages/apps-config/src/ui/colors.ts +++ b/packages/apps-config/src/ui/colors.ts @@ -102,7 +102,8 @@ export const chainColors: Record = [ ['HydraDX Snakenet', chainSnakenet], ['Idavoll', chainIdavoll], ['IntegriTEE PC1', chainIntegritee], - ['Jupiter Testnet', chainJupiter], + ['Jupiter A1', chainJupiter], + ['Jupiter PC1', chainJupiter], ['KILT Collator Rococo', chainKilt], ['KILT Testnet', chainKilt], ['Kulupu', chainKulupu], @@ -155,9 +156,9 @@ export const nodeColors: Record = [ ['Encointer Node noTEE', nodeEncointerNotee], ['Encointer Node TEE proxy', nodeEncointerTeeproxy], ['Equilibrium node', nodeEquilibrium], - ['Jupiter Node', nodeJupiter], ['Litentry Collator', nodeLitentry], ['nodle chain node', nodeNodle], + ['Patract Node', nodeJupiter], ['Polkadex Node', nodePolkadex], ['Sgc', nodeSgc], ['SORA-staging Node', nodeSora], diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index 879957f733..39f3a3245f 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -90,6 +90,8 @@ export const chainLogos: Record = [ ['Encointer PC1', nodeEncointerNotee], ['Idavoll', nodeIdavoll], ['IntegriTEE PC1', nodeIntegritee], + ['Jupiter A1', nodeJupiter], + ['Jupiter PC1', nodeJupiter], ['KILT PC1', nodeKilt], ['Kusama', chainKusama], // new name after CC3 ['Kusama CC1', chainKusama], @@ -152,7 +154,6 @@ export const nodeLogos: Record = [ ['Galois', nodeMath], ['hanonycash', nodeHanonycash], ['Idavoll Node', nodeIdavoll], - ['Jupiter Node', nodeJupiter], ['KILT Node', nodeKilt], ['KILT Collator', nodeKilt], ['kulupu', nodeKulupu], @@ -160,6 +161,7 @@ export const nodeLogos: Record = [ ['Litentry Collator', nodeLitentry], ['node-template', nodeSubstrate], ['Nodle Chain Node', nodeNodle], + ['Patract Node', nodeJupiter], ['Polkadex Node', nodePolkadex], ['parity-polkadot', nodePolkadot], ['Plasm', nodePlasm], @@ -244,6 +246,7 @@ export const namedLogos: Record = { rococoHydrate: chainHydrate, rococoIdavoll: nodeIdavoll, rococoIntegritee: nodeIntegritee, + rococoJupiter: nodeJupiter, rococoKilt: nodeKilt, rococoLaminar: nodeLaminar, rococoLitentry: nodeLitentry,