diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index be83e8d7c1..801bd7864d 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -13,6 +13,7 @@ "dependencies": { "@acala-network/type-definitions": "0.3.1", "@babel/runtime": "^7.11.2", - "@edgeware/node-types": "^2.4.1" + "@edgeware/node-types": "^2.4.1", + "@laminar/type-definitions": "^0.2.0-beta.134" } } diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index bcaa8954e6..5a11495503 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -11,6 +11,7 @@ import encointerNodeNotee from './encointer-node-notee'; import encointerNodeTeeproxy from './encointer-node-teeproxy'; import kilt from './kilt'; import kulupu from './kulupu'; +import laminar from './laminar'; import nodeTemplate from './node-template'; import nodle from './nodle'; import stablePoc from './stable-poc'; @@ -25,6 +26,7 @@ export default { 'encointer-node-notee': encointerNodeNotee, 'encointer-node-teeproxy': encointerNodeTeeproxy, kulupu, + laminar, 'mashnet-node': kilt, 'node-template': nodeTemplate, 'nodle-chain': nodle, diff --git a/packages/apps-config/src/api/spec/laminar.ts b/packages/apps-config/src/api/spec/laminar.ts new file mode 100644 index 0000000000..2824913685 --- /dev/null +++ b/packages/apps-config/src/api/spec/laminar.ts @@ -0,0 +1,10 @@ +// Copyright 2017-2020 @polkadot/apps-config authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import * as laminarDefinitions from '@laminar/type-definitions'; +import { typesFromDefs } from '../util'; + +const lamiTypes = typesFromDefs(laminarDefinitions); + +export default lamiTypes; diff --git a/packages/apps-config/src/settings/endpoints.ts b/packages/apps-config/src/settings/endpoints.ts index 917071abdf..7b24ca5668 100644 --- a/packages/apps-config/src/settings/endpoints.ts +++ b/packages/apps-config/src/settings/endpoints.ts @@ -183,6 +183,11 @@ function createTest (t: TFunction): LinkOption[] { info: 'kilt', text: t('rpc.kilt', 'Mashnet (KILT Canary, hosted by KILT Protocol)', { ns: 'apps-config' }), value: 'wss://full-nodes.kilt.io:9944/' + }, + { + info: 'laminar', + text: t('rpc.turbulence', 'Turbulence (Laminar Testnet, hosted by Laminar)', { ns: 'apps-config' }), + value: 'wss://testnet-node-1.laminar-chain.laminar.one/ws' } ]; } diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index 85135c935c..abcdb76668 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -24,6 +24,7 @@ import nodePolkadot from './nodes/polkadot-circle.svg'; import nodePolkadotJs from './nodes/polkadot-js.svg'; import nodeSubstrate from './nodes/substrate-hexagon.svg'; import nodeKulupu from './nodes/kulupu.svg'; +import nodeLaminar from './nodes/laminar-circle.svg'; // extensions import extensionPolkadotJs from './extensions/polkadot-js.svg'; @@ -78,6 +79,7 @@ const namedLogos: Record = { kilt: nodeKilt, kulupu: nodeKulupu, kusama: chainKusama, + laminar: nodeLaminar, nodle: nodeNodle, polkadot: nodePolkadot, rococo: chainRococo, diff --git a/packages/apps-config/src/ui/logos/nodes/laminar-circle.svg b/packages/apps-config/src/ui/logos/nodes/laminar-circle.svg new file mode 100755 index 0000000000..8d3f52d7ac --- /dev/null +++ b/packages/apps-config/src/ui/logos/nodes/laminar-circle.svg @@ -0,0 +1,9 @@ + + Group 9 + + + + + + + \ No newline at end of file diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index eacadb741a..9a88e046e0 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -15,6 +15,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.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hosted by Parity)", "ss58.centrifuge": "Centrifuge (live)", "ss58.default": "Default for the connected node", diff --git a/packages/apps/public/locales/es/translation.json b/packages/apps/public/locales/es/translation.json index 600ab68225..9e99b7700e 100644 --- a/packages/apps/public/locales/es/translation.json +++ b/packages/apps/public/locales/es/translation.json @@ -968,6 +968,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.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Testnet de Polkadot, ofrecido por Parity)", "runners up": "primeros puestos", "scheduling": "planificación", diff --git a/packages/apps/public/locales/ja/translation.json b/packages/apps/public/locales/ja/translation.json index e41748af47..3c55d571a2 100644 --- a/packages/apps/public/locales/ja/translation.json +++ b/packages/apps/public/locales/ja/translation.json @@ -507,6 +507,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.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hosted by Parity)", "scheduling": "スケジューリング", "secret": "秘密", diff --git a/packages/apps/public/locales/pt/translation.json b/packages/apps/public/locales/pt/translation.json index cecaacd29b..1f2799b170 100644 --- a/packages/apps/public/locales/pt/translation.json +++ b/packages/apps/public/locales/pt/translation.json @@ -973,6 +973,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.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hospedado pela Parity)", "runners up": "finalistas", "scheduling": "agendamento", diff --git a/packages/apps/public/locales/ru/translation.json b/packages/apps/public/locales/ru/translation.json index 2e22c7aaf8..8c07135631 100644 --- a/packages/apps/public/locales/ru/translation.json +++ b/packages/apps/public/locales/ru/translation.json @@ -986,6 +986,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.turbulence": "Turbulence (Laminar Testnet, hosted by Laminar)", "rpc.westend": "Westend (Polkadot Testnet, hosted by Parity)", "runners up": "претенденты", "scheduling": "планирование", diff --git a/packages/apps/webpack.base.config.js b/packages/apps/webpack.base.config.js index 4fb1d34154..9e0ce343f7 100644 --- a/packages/apps/webpack.base.config.js +++ b/packages/apps/webpack.base.config.js @@ -149,7 +149,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|react|ui|util|vanitygen)|@acala-network|@edgeware|@ledgerhq|@open-web3|@zondax|edgeware)/ + /* 02 */ /node_modules\/(@polkadot\/(extension|keyring|react|ui|util|vanitygen)|@acala-network|@edgeware|@laminar|@ledgerhq|@open-web3|@zondax|edgeware)/ ]), ...mapChunks('react', [ /* 00 */ /node_modules\/(@fortawesome)/, diff --git a/yarn.lock b/yarn.lock index a5d59ffca5..869e35b10d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1962,6 +1962,15 @@ __metadata: languageName: node linkType: hard +"@laminar/type-definitions@npm:^0.2.0-beta.134": + version: 0.2.0-beta.138 + resolution: "@laminar/type-definitions@npm:0.2.0-beta.138" + dependencies: + "@open-web3/orml-type-definitions": ^0.6.0-beta.1 + checksum: 8bb57cf0358847b1976e8f617bc35c7d4c46809578b0269373e2df2fc23698438d5d10caba603b9fc8f600f7291b9ebb4e505b4513e9edeeda796d477280a48b + languageName: node + linkType: hard + "@ledgerhq/devices@npm:^5.22.0": version: 5.22.0 resolution: "@ledgerhq/devices@npm:5.22.0" @@ -3035,6 +3044,13 @@ __metadata: languageName: node linkType: hard +"@open-web3/orml-type-definitions@npm:^0.6.0-beta.1": + version: 0.6.0-beta.5 + resolution: "@open-web3/orml-type-definitions@npm:0.6.0-beta.5" + checksum: a2075feaa1863372f1fbb79112278131b38aa13ddf36c609d84bf7b34ec7d37a942c53b6febd6ea0a2aa4688fe4e84e94f3bcd3204d8a2f9f0a875237ae77c68 + languageName: node + linkType: hard + "@pinata/sdk@npm:^1.1.11": version: 1.1.11 resolution: "@pinata/sdk@npm:1.1.11" @@ -3332,6 +3348,7 @@ __metadata: "@acala-network/type-definitions": 0.3.1 "@babel/runtime": ^7.11.2 "@edgeware/node-types": ^2.4.1 + "@laminar/type-definitions": ^0.2.0-beta.134 languageName: unknown linkType: soft