Skip to content

add jupiter testnet #4334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 2 commits into from
Jan 8, 2021
Merged

add jupiter testnet #4334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
984a4e1
feat(jupiter): add jupiter testnet
zzcwoshizz Jan 7, 2021
a74e869
feat(jupiter): change jupiter types
zzcwoshizz Jan 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/apps-config/src/api/spec/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import encointerNodeTeeproxy from './encointer-node-teeproxy';
import equilibrium from './equilibrium';
import galois from './galois';
import hanonycash from './hanonycash';
import jupiter from './jupiter';
import kilt from './kilt';
import nodle from './nodle';
import phala from './phala';
Expand Down Expand Up @@ -47,6 +48,7 @@ export default {
'encointer-node-teeproxy': encointerNodeTeeproxy,
galois: galois,
hanonycash,
jupiter,
'mashnet-node': kilt,
'nodle-chain': nodle,
'phala-node': phala,
Expand Down
10 changes: 10 additions & 0 deletions packages/apps-config/src/api/spec/jupiter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// Copyright 2017-2021 @polkadot/apps-config authors & contributors
// SPDX-License-Identifier: Apache-2.0

// structs need to be in order
/* eslint-disable sort-keys */

export default {
Address: 'MultiAddress',
LookupSource: 'MultiAddress'
Copy link
Member

@jacogr jacogr Jan 7, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't we also have Address: 'MultiAddress?

Copy link
Contributor

@atenjin atenjin Jan 8, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @jacogr
We define for type Address is same to node-template define(pub type Address = sp_runtime::MultiAddress<AccountId, ()>;). Thus there are two points related to this:

  1. node-template have not changed the define of

    types: {
  Address: 'AccountId',
  LookupSource: 'AccountId'
}

    We think this should be changed after the pr More Extensible Multiaddress Format paritytech/substrate#7380 in substrate,

    using:

    {
  "LookupSource": "MultiAddress",
  "Address": "LookupSource"
}

    We may create a pr to fix this if you will, or you may have some your own considerations.

  2. In our chain, using polkadot.js would use default config, thus, in node config, the default already has:

    "Address": "LookupSource"

    thus we just override

    LookupSource: 'MultiAddress'

    is ok. But you are right, override both LookupSource and Address may be better, we will change later, thanks!

};
14 changes: 14 additions & 0 deletions packages/apps-config/src/endpoints/testing.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,20 @@ export function createTesting (t: TFunction): LinkOption[] {
text: t('rpc.zero', 'zero', { ns: 'apps-config' }),
textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'ZERO' } }),
value: 'wss://alphaville-0.zero.io'
},
{
dnslink: 'jupiter',
info: 'jupiter',
text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Elara' } }),
value: 'wss://jupiter.elara.patract.io'
},
{
dnslink: 'jupiter',
info: 'jupiter',
text: t('rpc.jupiter', 'Jupiter', { ns: 'apps-config' }),
textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Patract' } }),
value: 'wss://ws.jupiter.patract.cn'
}
];
}
8 changes: 6 additions & 2 deletions packages/apps-config/src/ui/colors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const chainRoccoTrick = '#2222bb';
const chainWestend = '#da68a7';
const chainGalois = '#000000';
const chainZero = '#000000';
const chainJupiter = '#7143ff';

// based on node name
// alphabetical
Expand All @@ -46,6 +47,7 @@ const nodeSora = '#2D2926';
const nodeStafi = '#00F3AB';
const nodeSubsocial = '#b9018c';
const nodeZero = '#0099cc';
const nodeJupiter = '#7143ff';

export { emptyColor };

Expand Down Expand Up @@ -76,7 +78,8 @@ export const chainColors: Record<string, any> = [
['Trick', chainRoccoTrick],
['Westend', chainWestend],
['Galois', chainGalois],
['ZΞRO Alphaville', chainZero]
['ZΞRO Alphaville', chainZero],
['Jupiter Testnet', chainJupiter]
].reduce((colors, [chain, color]): Record<string, any> => ({
...colors,
[chain.toLowerCase()]: color
Expand All @@ -99,7 +102,8 @@ export const nodeColors: Record<string, any> = [
['SORA-staging Node', nodeSora],
['Stafi node', nodeStafi],
['subsocial node', nodeSubsocial],
['SUBZΞRO', nodeZero]
['SUBZΞRO', nodeZero],
['Jupiter Node', nodeJupiter]
// ['node template', emptyColor],
// ['parity polkadot', emptyColor],
// ['substrate node', emptyColor]
Expand Down
5 changes: 4 additions & 1 deletion packages/apps-config/src/ui/logos/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import nodeEncointerNotee from './nodes/encointer-notee.svg';
import nodeEncointerTeeproxy from './nodes/encointer-teeproxy.svg';
import nodeEquilibrium from './nodes/equilibrium.svg';
import nodeHanonycash from './nodes/hanonycash.svg';
import nodeJupiter from './nodes/jupiter.svg';
import nodeKilt from './nodes/kilt.svg';
import nodeKulupu from './nodes/kulupu.svg';
import nodeLaminar from './nodes/laminar-circle.svg';
Expand Down Expand Up @@ -109,7 +110,8 @@ export const nodeLogos: Record<string, unknown> = [
['substrate-node', nodeSubstrate],
['Equilibrium Node', nodeEquilibrium],
['Equilibrium', nodeEquilibrium],
['SUBZΞRO', nodeZero]
['SUBZΞRO', nodeZero],
['Jupiter Node', nodeJupiter]
].reduce((logos, [node, logo]): Record<string, unknown> => ({
...logos,
[(node as string).toLowerCase().replace(/-/g, ' ')]: logo
Expand Down Expand Up @@ -138,6 +140,7 @@ export const namedLogos: Record<string, unknown> = {
equilibrium: nodeEquilibrium,
galois: nodeMath,
hanonycash: nodeHanonycash,
jupiter: nodeJupiter,
kilt: nodeKilt,
kulupu: nodeKulupu,
kusama: chainKusama,
Expand Down
1 change: 1 addition & 0 deletions packages/apps-config/src/ui/logos/nodes/jupiter.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.