From 61e4bf822a15bba53c159e7ea4fc85f082e8ddc5 Mon Sep 17 00:00:00 2001 From: Stefan Popov Date: Tue, 24 Nov 2020 09:51:04 +0300 Subject: [PATCH] Add SORA-Substrate testnet (#4059) * Add SORA-Substrate testnet * Fix color and logo issues --- packages/apps-config/package.json | 1 + packages/apps-config/src/api/bundle/spec/index.ts | 4 +++- .../apps-config/src/api/bundle/spec/soraSubstrate.ts | 7 +++++++ packages/apps-config/src/api/rpc/index.ts | 5 ++++- packages/apps-config/src/api/rpc/soraSubstrate.ts | 7 +++++++ packages/apps-config/src/settings/endpoints.ts | 6 ++++++ packages/apps-config/src/ui/colors.ts | 2 ++ packages/apps-config/src/ui/logos/index.ts | 3 +++ .../apps-config/src/ui/logos/nodes/sora-substrate.svg | 5 +++++ packages/apps/public/locales/en/apps-config.json | 1 + packages/apps/public/locales/es/translation.json | 1 + packages/apps/public/locales/ja/translation.json | 1 + packages/apps/public/locales/pt/translation.json | 1 + packages/apps/public/locales/ru/translation.json | 1 + packages/apps/webpack.base.config.js | 2 +- yarn.lock | 10 ++++++++++ 16 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 packages/apps-config/src/api/bundle/spec/soraSubstrate.ts create mode 100644 packages/apps-config/src/api/rpc/soraSubstrate.ts create mode 100644 packages/apps-config/src/ui/logos/nodes/sora-substrate.svg diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 4a087e8185..dfd24d1c34 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -14,6 +14,7 @@ "@edgeware/node-types": "^3.0.7", "@laminar/type-definitions": "^0.2.0-beta.141", "@polkadot/networks": "^4.2.1", + "@sora-substrate/type-definitions": "^0.1.4", "@subsocial/types": "^0.4.7" }, "devDependencies": { diff --git a/packages/apps-config/src/api/bundle/spec/index.ts b/packages/apps-config/src/api/bundle/spec/index.ts index 852364ef17..eb0f79ab8c 100644 --- a/packages/apps-config/src/api/bundle/spec/index.ts +++ b/packages/apps-config/src/api/bundle/spec/index.ts @@ -3,9 +3,11 @@ import acala from './acala'; import laminar from './laminar'; +import soraSubstrate from './soraSubstrate'; export default { acala, laminar, - mandala: acala + mandala: acala, + 'sora-substrate': soraSubstrate }; diff --git a/packages/apps-config/src/api/bundle/spec/soraSubstrate.ts b/packages/apps-config/src/api/bundle/spec/soraSubstrate.ts new file mode 100644 index 0000000000..94b1171e2d --- /dev/null +++ b/packages/apps-config/src/api/bundle/spec/soraSubstrate.ts @@ -0,0 +1,7 @@ +// Copyright 2017-2020 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { slimOverrideBundle } from '@sora-substrate/type-definitions'; +import { OverrideBundleDefinition } from '@polkadot/types/types'; + +export default slimOverrideBundle.spec.sora as OverrideBundleDefinition; diff --git a/packages/apps-config/src/api/rpc/index.ts b/packages/apps-config/src/api/rpc/index.ts index 697be74282..6bbf5efb96 100644 --- a/packages/apps-config/src/api/rpc/index.ts +++ b/packages/apps-config/src/api/rpc/index.ts @@ -2,9 +2,12 @@ // SPDX-License-Identifier: Apache-2.0 import moonbeam from './moonbeam'; +import soraSubstrate from './soraSubstrate'; // Add your rpc method definitions here export default { // Moonbeam rpc types (Frontier) - ...moonbeam() + ...moonbeam(), + // SORA-Substrate rpc + ...soraSubstrate // FIXME: 'sora-substrate': soraSubstrate when resolve-by-specname is available }; diff --git a/packages/apps-config/src/api/rpc/soraSubstrate.ts b/packages/apps-config/src/api/rpc/soraSubstrate.ts new file mode 100644 index 0000000000..b08c1d5aed --- /dev/null +++ b/packages/apps-config/src/api/rpc/soraSubstrate.ts @@ -0,0 +1,7 @@ +// Copyright 2017-2020 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { rpc } from '@sora-substrate/type-definitions'; +import { DefinitionRpc } from '@polkadot/types/types'; + +export default rpc as Record>; diff --git a/packages/apps-config/src/settings/endpoints.ts b/packages/apps-config/src/settings/endpoints.ts index 7e7f169aa3..cf3b2d2c8d 100644 --- a/packages/apps-config/src/settings/endpoints.ts +++ b/packages/apps-config/src/settings/endpoints.ts @@ -331,6 +331,12 @@ function createTestNetworks (t: TFunction): LinkOption[] { textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Laminar' } }), value: 'wss://testnet-node-1.laminar-chain.laminar.one/ws' }, + { + info: 'sora-substrate', + text: t('rpc.sora-substrate', 'SORA-Substrate', { ns: 'apps-config' }), + textBy: t('rpc.hosted.by', 'hosted by {{host}}', { ns: 'apps-config', replace: { host: 'Soramitsu' } }), + value: 'wss://ws.parachain-node-1.s1.dev.soraneo.soramitsu.co.jp' + }, { dnslink: 'westend', info: 'westend', diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts index 0d9060c3b7..8e74f53927 100644 --- a/packages/apps-config/src/ui/colors.ts +++ b/packages/apps-config/src/ui/colors.ts @@ -37,6 +37,7 @@ const nodeEquilibrium = '#1792ff'; const nodeMoonbeam = '#53cbc9'; const nodeNodle = '#1ab394'; const nodeKilt = '#eb5b2a'; +const nodeSora = '#2D2926'; const nodeStafi = '#00F3AB'; const nodeSubsocial = '#b9018c'; @@ -83,6 +84,7 @@ export const nodeColors: Record = [ ['Equilibrium node', nodeEquilibrium], ['kilt node', nodeKilt], ['nodle chain node', nodeNodle], + ['SORA-Substrate Node', nodeSora], ['Stafi node', nodeStafi], ['subsocial node', nodeSubsocial] // ['node template', emptyColor], diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index f4b8abad38..217762582a 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -38,6 +38,7 @@ import nodePhala from './nodes/phala.svg'; import nodePlasm from './nodes/plasm.png'; import nodePolkadot from './nodes/polkadot-circle.svg'; import nodePolkadotJs from './nodes/polkadot-js.svg'; +import nodeSora from './nodes/sora-substrate.svg'; import nodeRobonomics from './nodes/robonomics.svg'; import nodeStafi from './nodes/stafi.png'; import nodeSubsocial from './nodes/subsocial.svg'; @@ -105,6 +106,7 @@ export const nodeLogos: Record = [ ['Plasm Node', nodePlasm], ['phala-substrate-node', nodePhala], ['polkadot-js', nodePolkadotJs], + ['SORA-Substrate Node', nodeSora], ['Stafi Node', nodeStafi], ['Stafi', nodeStafi], ['subsocial-node', nodeSubsocial], @@ -154,6 +156,7 @@ export const namedLogos: Record = { rococoTick: chainRococoTick, rococoTrack: chainRococoTrack, rococoTrick: chainRococoTrick, + 'sora-substrate': nodeSora, stafi: nodeStafi, subsocial: nodeSubsocial, substrate: nodeSubstrate, diff --git a/packages/apps-config/src/ui/logos/nodes/sora-substrate.svg b/packages/apps-config/src/ui/logos/nodes/sora-substrate.svg new file mode 100644 index 0000000000..5ad5501509 --- /dev/null +++ b/packages/apps-config/src/ui/logos/nodes/sora-substrate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index 8c6a3f76c8..3bd9b4bcf2 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -48,6 +48,7 @@ "rpc.rococo.tick": "Tick", "rpc.rococo.track": "Track", "rpc.rococo.trick": "Trick", + "rpc.sora-substrate": "SORA-Substrate", "rpc.stafi": "Stafi", "rpc.subsocial": "Subsocial", "rpc.turbulence": "Turbulence", diff --git a/packages/apps/public/locales/es/translation.json b/packages/apps/public/locales/es/translation.json index 26d0fc762b..99565be9b1 100644 --- a/packages/apps/public/locales/es/translation.json +++ b/packages/apps/public/locales/es/translation.json @@ -969,6 +969,7 @@ "rpc.local": "Nodo local (propio, 127.0.0.1:9944)", "rpc.mandala": "Mandala (Acala Testnet, hosted by Acala)", "rpc.nodle-arcadia": "Arcadia (Testnet Nodle, ofrecido por Nodle)", + "rpc.sora-substrate": "SORA-Substrate (SORA-Substrate Testnet, hosted by Soramitsu)", "rpc.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Testnet de Polkadot, ofrecido por Parity)", "runners up": "primeros puestos", diff --git a/packages/apps/public/locales/ja/translation.json b/packages/apps/public/locales/ja/translation.json index fa00e7ea96..39c0a881d8 100644 --- a/packages/apps/public/locales/ja/translation.json +++ b/packages/apps/public/locales/ja/translation.json @@ -508,6 +508,7 @@ "rpc.local": "Local Node (Own, 127.0.0.1:9944)", "rpc.mandala": "Mandala (Acala Testnet, hosted by Acala)", "rpc.nodle-arcadia": "Arcadia (Nodle Testnet, hosted by Nodle)", + "rpc.sora-substrate": "SORA-Substrate (SORA-Substrate Testnet, hosted by Soramitsu)", "rpc.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hosted by Parity)", "scheduling": "スケジューリング", diff --git a/packages/apps/public/locales/pt/translation.json b/packages/apps/public/locales/pt/translation.json index fc9ad5b0b5..42dda0ef18 100644 --- a/packages/apps/public/locales/pt/translation.json +++ b/packages/apps/public/locales/pt/translation.json @@ -974,6 +974,7 @@ "rpc.local": "Nó local (Próprio, 127.0.0.1:9944)", "rpc.mandala": "Mandala (Acala Testnet, hosted by Acala)", "rpc.nodle-arcadia": "Arcadia (Nodle Testnet, hospedado por Nodle)", + "rpc.sora-substrate": "SORA-Substrate (SORA-Substrate Testnet, hosted by Soramitsu)", "rpc.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hospedado pela Parity)", "runners up": "finalistas", diff --git a/packages/apps/public/locales/ru/translation.json b/packages/apps/public/locales/ru/translation.json index d98557cc8c..64ece42ea6 100644 --- a/packages/apps/public/locales/ru/translation.json +++ b/packages/apps/public/locales/ru/translation.json @@ -987,6 +987,7 @@ "rpc.local": "Локальная нода (Own, 127.0.0.1:9944)", "rpc.mandala": "Mandala (Acala Testnet, hosted by Acala)", "rpc.nodle-arcadia": "Arcadia (Nodle Testnet, hosted by Nodle)", + "rpc.sora-substrate": "SORA-Substrate (SORA-Substrate Testnet, hosted by Soramitsu)", "rpc.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hosted by Parity)", "runners up": "претенденты", diff --git a/packages/apps/webpack.base.config.js b/packages/apps/webpack.base.config.js index 3a9132ae9f..9711285f43 100644 --- a/packages/apps/webpack.base.config.js +++ b/packages/apps/webpack.base.config.js @@ -158,7 +158,7 @@ function createWebpack (ENV, context) { ...mapChunks('polkadot', [ /* 00 */ /node_modules\/@polkadot\/(wasm)/, /* 01 */ /node_modules\/(@polkadot\/(api|metadata|rpc|types))/, - /* 02 */ /node_modules\/(@polkadot\/(extension|keyring|networks|react|ui|util|vanitygen)|@acala-network|@edgeware|@laminar|@ledgerhq|@open-web3|@subsocial|@zondax|edgeware)/ + /* 02 */ /node_modules\/(@polkadot\/(extension|keyring|networks|react|ui|util|vanitygen)|@acala-network|@edgeware|@laminar|@ledgerhq|@open-web3|@sora-substrate|@subsocial|@zondax|edgeware)/ ]), ...mapChunks('react', [ /* 00 */ /node_modules\/(@fortawesome)/, diff --git a/yarn.lock b/yarn.lock index c79630b993..129518dfd2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2261,6 +2261,7 @@ __metadata: "@edgeware/node-types": ^3.0.7 "@laminar/type-definitions": ^0.2.0-beta.141 "@polkadot/networks": ^4.2.1 + "@sora-substrate/type-definitions": ^0.1.4 "@subsocial/types": ^0.4.7 i18next: ^19.8.3 languageName: unknown @@ -2937,6 +2938,15 @@ __metadata: languageName: node linkType: hard +"@sora-substrate/type-definitions@npm:^0.1.4": + version: 0.1.4 + resolution: "@sora-substrate/type-definitions@npm:0.1.4" + dependencies: + "@open-web3/orml-type-definitions": ^0.6.0-beta.26 + checksum: a5e3035f9d7279010841fa656d3a8de582ce51988adaa53d5f813d44d77347780629d70c16671e5fe50db9398fba6f687e78ff383888b71393ffd656effa4ec8 + languageName: node + linkType: hard + "@stardust-ui/react-component-event-listener@npm:~0.38.0": version: 0.38.0 resolution: "@stardust-ui/react-component-event-listener@npm:0.38.0"