diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 5e75491bb7..73982e2b7f 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -14,6 +14,7 @@ "@acala-network/type-definitions": "^0.4.0-beta.1", "@babel/runtime": "^7.11.2", "@edgeware/node-types": "^2.4.1", - "@laminar/type-definitions": "^0.2.0-beta.134" + "@laminar/type-definitions": "^0.2.0-beta.134", + "@subsocial/types": "^0.4.3" } } diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 5a11495503..3cd0b7cd68 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -15,6 +15,7 @@ import laminar from './laminar'; import nodeTemplate from './node-template'; import nodle from './nodle'; import stablePoc from './stable-poc'; +import subsocialNode from './subsocial'; export default { Crab: crab, @@ -31,5 +32,6 @@ export default { 'node-template': nodeTemplate, 'nodle-chain': nodle, 'stable-poc': stablePoc, - stable_poc: stablePoc + stable_poc: stablePoc, + subsocial: subsocialNode }; diff --git a/packages/apps-config/src/api/spec/subsocial.ts b/packages/apps-config/src/api/spec/subsocial.ts new file mode 100644 index 0000000000..9b345cac28 --- /dev/null +++ b/packages/apps-config/src/api/spec/subsocial.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 subsocialDefinitions from '@subsocial/types/substrate/interfaces/definitions'; +import { typesFromDefs } from '../util'; + +const subsocialTypes = typesFromDefs(subsocialDefinitions); + +export default subsocialTypes; diff --git a/packages/apps-config/src/settings/endpoints.ts b/packages/apps-config/src/settings/endpoints.ts index a259414131..9e18b36bdf 100644 --- a/packages/apps-config/src/settings/endpoints.ts +++ b/packages/apps-config/src/settings/endpoints.ts @@ -110,6 +110,11 @@ function createLive (t: TFunction): LinkOption[] { info: 'nodle', text: t('rpc.nodle-main', 'Nodle Main (Nodle Mainnet, hosted by Nodle)', { ns: 'apps-config' }), value: 'wss://main1.nodleprotocol.io' + }, + { + info: 'subsocial', + text: t('rpc.subsocial', 'Subsocial (Subsocial Network, hosted by DappForce)', { ns: 'apps-config' }), + value: 'wss://rpc.subsocial.network' } ]; } diff --git a/packages/apps-config/src/settings/ss58.ts b/packages/apps-config/src/settings/ss58.ts index cbf61cdd01..1a38418c68 100644 --- a/packages/apps-config/src/settings/ss58.ts +++ b/packages/apps-config/src/settings/ss58.ts @@ -36,6 +36,11 @@ export default function create (t: TFunction): Option[] { text: t('ss58.edgeware', 'Edgeware (live)', { ns: 'apps-config' }), value: 7 }, + { + info: 'subsocial', + text: t('ss58.subsocial', 'Subsocial (live)', { ns: 'apps-config' }), + value: 28 + }, { info: 'centrifuge', text: t('ss58.centrifuge', 'Centrifuge (live)', { ns: 'apps-config' }), diff --git a/packages/apps-config/src/ui/general/index.ts b/packages/apps-config/src/ui/general/index.ts index fdea3365e2..70b5d380e3 100644 --- a/packages/apps-config/src/ui/general/index.ts +++ b/packages/apps-config/src/ui/general/index.ts @@ -21,6 +21,7 @@ const nodeCentrifuge = '#fcc367'; const nodeEdgeware = '#0a95df'; const nodeNodle = '#1ab394'; const nodeKilt = '#eb5b2a'; +const nodeSubsocial = '#b9018c'; // overrides based on the actual matched chain name const chainColors: Record = [ @@ -49,7 +50,8 @@ const nodeColors: Record = [ ['centrifuge chain', nodeCentrifuge], ['edgeware node', nodeEdgeware], ['kilt node', nodeKilt], - ['nodle chain node', nodeNodle] + ['nodle chain node', nodeNodle], + ['subsocial node', nodeSubsocial] // ['node template', emptyColor], // ['parity polkadot', emptyColor], // ['substrate node', emptyColor] diff --git a/packages/apps-config/src/ui/identityIcons/index.ts b/packages/apps-config/src/ui/identityIcons/index.ts index 6a30f3db62..8a7b5c39e8 100644 --- a/packages/apps-config/src/ui/identityIcons/index.ts +++ b/packages/apps-config/src/ui/identityIcons/index.ts @@ -10,6 +10,7 @@ const identityNodes: Record = [ ['node-template', 'substrate'], ['parity-polkadot', 'polkadot'], ['polkadot-js', 'polkadot'], + ['subsocial-node', 'substrate'], ['substrate-node', 'substrate'] ].reduce((icons, [spec, icon]): Record => ({ ...icons, diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index 6f28f7f74e..525df25b0c 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -22,6 +22,7 @@ import nodeNodle from './nodes/nodle.svg'; import nodeKilt from './nodes/kilt.svg'; import nodePolkadot from './nodes/polkadot-circle.svg'; import nodePolkadotJs from './nodes/polkadot-js.svg'; +import nodeSubsocial from './nodes/subsocial.svg'; import nodeSubstrate from './nodes/substrate-hexagon.svg'; import nodeKulupu from './nodes/kulupu.svg'; import nodeLaminar from './nodes/laminar-circle.svg'; @@ -62,6 +63,7 @@ const nodeLogos: Record = [ ['Nodle Chain Node', nodeNodle], ['parity-polkadot', nodePolkadot], ['polkadot-js', nodePolkadotJs], + ['subsocial-node', nodeSubsocial], ['substrate-node', nodeSubstrate] ].reduce((logos, [node, logo]): Record => ({ ...logos, @@ -88,6 +90,7 @@ const namedLogos: Record = { rococoTick: chainRococoTick, rococoTrack: chainRococoTrack, rococoTrick: chainRococoTrick, + subsocial: nodeSubsocial, substrate: nodeSubstrate, westend: nodePolkadot }; diff --git a/packages/apps-config/src/ui/logos/nodes/subsocial.svg b/packages/apps-config/src/ui/logos/nodes/subsocial.svg new file mode 100644 index 0000000000..119e87963b --- /dev/null +++ b/packages/apps-config/src/ui/logos/nodes/subsocial.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/yarn.lock b/yarn.lock index 0bf2fcc137..21a58036d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1503,6 +1503,17 @@ __metadata: languageName: node linkType: hard +"@dabh/diagnostics@npm:^2.0.2": + version: 2.0.2 + resolution: "@dabh/diagnostics@npm:2.0.2" + dependencies: + colorspace: 1.1.x + enabled: 2.0.x + kuler: ^2.0.0 + checksum: 557eff796a6829f42b67ca039ea580fe618500d543379d9f3868630fcc9f1a7cf48acb169706756c454c7226c99f9038123b2898a37dca8f3e491595f66ccae1 + languageName: node + linkType: hard + "@develar/schema-utils@npm:~2.6.5": version: 2.6.5 resolution: "@develar/schema-utils@npm:2.6.5" @@ -3349,6 +3360,7 @@ __metadata: "@babel/runtime": ^7.11.2 "@edgeware/node-types": ^2.4.1 "@laminar/type-definitions": ^0.2.0-beta.134 + "@subsocial/types": ^0.4.3 languageName: unknown linkType: soft @@ -3959,6 +3971,35 @@ __metadata: languageName: node linkType: hard +"@subsocial/types@npm:^0.4.3": + version: 0.4.3 + resolution: "@subsocial/types@npm:0.4.3" + dependencies: + "@babel/runtime": ^7.8.4 + "@subsocial/utils": ^0.1.23 + cids: ^0.7.1 + checksum: 19069de7ce389bd3af9fe80c25e431156f85e8f7b809f16664353f97d873422e87af8e18a6d6e7496d62238da642934f77dab994126d424c6e5b12e368979556 + languageName: node + linkType: hard + +"@subsocial/utils@npm:^0.1.23": + version: 0.1.23 + resolution: "@subsocial/utils@npm:0.1.23" + dependencies: + "@babel/runtime": ^7.8.4 + "@types/circular-json": ^0.4.0 + "@types/lodash.truncate": ^4.4.6 + "@types/winston": ^2.4.4 + bn.js: ^5.1.1 + chalk: ^3.0.0 + circular-json: ^0.5.9 + dotenv: ^8.0.0 + lodash.truncate: ^4.4.2 + winston: ^3.2.0 + checksum: 497ecb7bf89a9289de77245dceba4f596b1013e56269ae766e0fc57e58faaa8d447cea006abc49b6820622a92cd4ce61dfbde18e15885c141fda1e18808df2de + languageName: node + linkType: hard + "@szmarczak/http-timer@npm:^1.1.2": version: 1.1.2 resolution: "@szmarczak/http-timer@npm:1.1.2" @@ -4098,6 +4139,13 @@ __metadata: languageName: node linkType: hard +"@types/circular-json@npm:^0.4.0": + version: 0.4.0 + resolution: "@types/circular-json@npm:0.4.0" + checksum: 68470e292e4d8e92c0477595dd4b59eda5885b85d05837fc4272ce983fbb0ee5ea1ecb51a73d87b33d8d0ba6d2fd9b47212d2e28fc2d6e9d89db8a97d19b3271 + languageName: node + linkType: hard + "@types/codeflask@npm:^1.4.1": version: 1.4.1 resolution: "@types/codeflask@npm:1.4.1" @@ -4312,6 +4360,22 @@ __metadata: languageName: node linkType: hard +"@types/lodash.truncate@npm:^4.4.6": + version: 4.4.6 + resolution: "@types/lodash.truncate@npm:4.4.6" + dependencies: + "@types/lodash": "*" + checksum: 4d610c4e81323fe0a5f7a4231f81b1322939c58bcd98200e6ff5a3ef1427129d47c53f52003b328b018ee46acac78ad80142326ce18b9c4d65965f115838d361 + languageName: node + linkType: hard + +"@types/lodash@npm:*": + version: 4.14.160 + resolution: "@types/lodash@npm:4.14.160" + checksum: 9182b5745430de03597537619a90a849b733963409b30476bb01824b8047a5406da77069e25d259d6f3739bdf1719de01637ce50fb0440008964e67c1d134b83 + languageName: node + linkType: hard + "@types/memoizee@npm:^0.4.4": version: 0.4.4 resolution: "@types/memoizee@npm:0.4.4" @@ -4586,6 +4650,15 @@ __metadata: languageName: node linkType: hard +"@types/winston@npm:^2.4.4": + version: 2.4.4 + resolution: "@types/winston@npm:2.4.4" + dependencies: + winston: "*" + checksum: 2a6738177a4a6069420ea812a2c61cef25494af0615ee94cff304aa81d059539b8fba03a9fec96ab9b3d7de19f6bc6917fd58f2bc85551b106eeda82a9820f56 + languageName: node + linkType: hard + "@types/yargs-parser@npm:*": version: 15.0.0 resolution: "@types/yargs-parser@npm:15.0.0" @@ -6063,6 +6136,13 @@ __metadata: languageName: node linkType: hard +"async@npm:^3.1.0": + version: 3.2.0 + resolution: "async@npm:3.2.0" + checksum: 5c7913c08496877a9896dc6670d3a6c64f02d350e74b9e9191194959c473414a0732539ebdfec0fd2f34c20f439714773a30c20e0e68eb27bd8ee5ec9d8ff5ba + languageName: node + linkType: hard + "asynckit@npm:^0.4.0": version: 0.4.0 resolution: "asynckit@npm:0.4.0" @@ -7448,7 +7528,7 @@ __metadata: languageName: node linkType: hard -"cids@npm:~0.7.0": +"cids@npm:^0.7.1, cids@npm:~0.7.0": version: 0.7.5 resolution: "cids@npm:0.7.5" dependencies: @@ -7484,6 +7564,13 @@ __metadata: languageName: node linkType: hard +"circular-json@npm:^0.5.9": + version: 0.5.9 + resolution: "circular-json@npm:0.5.9" + checksum: ee5178367d06bb5ffe221d4e7f2ddd8a72eaf8e92fd6f2df1d2652251b63a6c63f6ea8b979619f213fbf53dba039b3859b402f13c19fed0e7f2a6c593c238d8a + languageName: node + linkType: hard + "class-is@npm:^1.1.0": version: 1.1.0 resolution: "class-is@npm:1.1.0" @@ -7774,6 +7861,16 @@ __metadata: languageName: node linkType: hard +"color@npm:3.0.x": + version: 3.0.0 + resolution: "color@npm:3.0.0" + dependencies: + color-convert: ^1.9.1 + color-string: ^1.5.2 + checksum: 55f17792ef8c2796a192c299df0ac7a2a3466f21c9692a60e09975a2f662df47a0fb5624df2b0dba3a29b0198fdcb3c095ec0e2efe98f1847fedadf74701404d + languageName: node + linkType: hard + "color@npm:^3.0.0, color@npm:^3.1.2": version: 3.1.2 resolution: "color@npm:3.1.2" @@ -7791,6 +7888,23 @@ __metadata: languageName: node linkType: hard +"colors@npm:^1.2.1": + version: 1.4.0 + resolution: "colors@npm:1.4.0" + checksum: a0f266ac041a9774d92cc9624a984707678d2eeec125d54e8d8231075ce36c24c5352fb5d0f90c6ee420d0f63e354417cec716386ad341309334aad18e32b933 + languageName: node + linkType: hard + +"colorspace@npm:1.1.x": + version: 1.1.2 + resolution: "colorspace@npm:1.1.2" + dependencies: + color: 3.0.x + text-hex: 1.0.x + checksum: 88006c5864149013be4be0b6ef50aa59e175ad56dbcf87a085c8e3d8288fa16295b290525c5432084687a0895d9e5b05b64803b2fa3b3e0ed67cd4d7c7b0e249 + languageName: node + linkType: hard + "columnify@npm:^1.5.4": version: 1.5.4 resolution: "columnify@npm:1.5.4" @@ -9728,7 +9842,7 @@ __metadata: languageName: node linkType: hard -"dotenv@npm:^8.2.0": +"dotenv@npm:^8.0.0, dotenv@npm:^8.2.0": version: 8.2.0 resolution: "dotenv@npm:8.2.0" checksum: 16cb89cbd7b98b053899b8aba8c5044c8fb61a2db8a81fe70360b75035fce5fed53bd7a34d772be717d0880c0321122a4c09423f518025e1b52d96791521b1a7 @@ -9991,6 +10105,13 @@ __metadata: languageName: node linkType: hard +"enabled@npm:2.0.x": + version: 2.0.0 + resolution: "enabled@npm:2.0.0" + checksum: fdffd21e02ad3f1279052945a4d2d3e5f70422f6c0a743c5745fecbb15c844e368ac029430a3398c1ebe28a921d8f21acad807e61bb1dad135fae5267cba4ef7 + languageName: node + linkType: hard + "encodeurl@npm:^1.0.2, encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -11037,6 +11158,13 @@ __metadata: languageName: node linkType: hard +"fast-safe-stringify@npm:^2.0.4": + version: 2.0.7 + resolution: "fast-safe-stringify@npm:2.0.7" + checksum: 7bd22543263b707870d70c6f2336b6e8563e34d6807dc388cc0566895e31e0a8273af017a7eb1c9538d0ef54288284e1c0585b557bd856491295a847159fd929 + languageName: node + linkType: hard + "fastq@npm:^1.6.0": version: 1.8.0 resolution: "fastq@npm:1.8.0" @@ -11082,6 +11210,13 @@ __metadata: languageName: node linkType: hard +"fecha@npm:^4.2.0": + version: 4.2.0 + resolution: "fecha@npm:4.2.0" + checksum: aa64b6bbd6c11c7f6ec66255a2abfcbb307a1c13e46235ef6055f695e7aa688f782807f32fcbf663bd248fd682ab4f7c3ab68ae15cf6bfcc3c0a019efe56a1f6 + languageName: node + linkType: hard + "figgy-pudding@npm:^3.4.1, figgy-pudding@npm:^3.5.1": version: 3.5.2 resolution: "figgy-pudding@npm:3.5.2" @@ -11419,6 +11554,13 @@ __metadata: languageName: node linkType: hard +"fn.name@npm:1.x.x": + version: 1.1.0 + resolution: "fn.name@npm:1.1.0" + checksum: e33a39ffd68424b58d849cb3672c2ed9c4f8dadf0ef9416d5b5d9b8877258c1aa0f42554aaa2d15e87bcb5892ce4d4f78bdbbc5856f5a2b79fc31a10b6e69c8f + languageName: node + linkType: hard + "follow-redirects@npm:1.5.10, follow-redirects@npm:^1.0.0": version: 1.5.10 resolution: "follow-redirects@npm:1.5.10" @@ -15307,6 +15449,13 @@ __metadata: languageName: node linkType: hard +"kuler@npm:^2.0.0": + version: 2.0.0 + resolution: "kuler@npm:2.0.0" + checksum: 801e252e7b936019a0ca4b636a4c50d3fa25e18020be8dd1ce82ef7a9eaca9e97060f9e1dd0fe062a1de6226f5b1377f552910e2f3ef5a2245d70112cd20a2b7 + languageName: node + linkType: hard + "last-call-webpack-plugin@npm:^3.0.0": version: 3.0.0 resolution: "last-call-webpack-plugin@npm:3.0.0" @@ -15679,6 +15828,13 @@ __metadata: languageName: node linkType: hard +"lodash.truncate@npm:^4.4.2": + version: 4.4.2 + resolution: "lodash.truncate@npm:4.4.2" + checksum: b1b0d7d993bb73d0032fe909d4523a836b6aa91566fa88ff78c3eac008bd3d3b2ba0f2e8381d7f906b1d6913a64982f34bea95dd556355c0d418bfddf3ab7b06 + languageName: node + linkType: hard + "lodash.uniq@npm:^4.5.0": version: 4.5.0 resolution: "lodash.uniq@npm:4.5.0" @@ -15727,6 +15883,19 @@ __metadata: languageName: node linkType: hard +"logform@npm:^2.2.0": + version: 2.2.0 + resolution: "logform@npm:2.2.0" + dependencies: + colors: ^1.2.1 + fast-safe-stringify: ^2.0.4 + fecha: ^4.2.0 + ms: ^2.1.1 + triple-beam: ^1.3.0 + checksum: ff10653f4198be481d384babee3fc4d998c23d6c916bdff4d79b1bfd70c8c35c6d5d7f8dfa3173cba6837aa286504c0207c9037c6477eac18dd969eca4619a4c + languageName: node + linkType: hard + "loglevel@npm:^1.6.8": version: 1.6.8 resolution: "loglevel@npm:1.6.8" @@ -17641,6 +17810,15 @@ __metadata: languageName: node linkType: hard +"one-time@npm:^1.0.0": + version: 1.0.0 + resolution: "one-time@npm:1.0.0" + dependencies: + fn.name: 1.x.x + checksum: f1efa31ce3e3ec54cd0d05dff9690bff1f14e96ee8fee27b52bfac372c659f07ab5df0c068d8aab06ca2c86c4bca810a98c65920c35f2c32c2ddb8226d0b307c + languageName: node + linkType: hard + "onetime@npm:^2.0.0": version: 2.0.1 resolution: "onetime@npm:2.0.1" @@ -20001,7 +20179,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:1 || 2, readable-stream@npm:2 || 3, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": +"readable-stream@npm:1 || 2, readable-stream@npm:2 || 3, readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:^2.3.7, readable-stream@npm:~2.3.6": version: 2.3.7 resolution: "readable-stream@npm:2.3.7" dependencies: @@ -21901,6 +22079,13 @@ __metadata: languageName: node linkType: hard +"stack-trace@npm:0.0.x": + version: 0.0.10 + resolution: "stack-trace@npm:0.0.10" + checksum: 8e567bd9dc88f739f562e91d127cfe11740c3639900c9ddadbb3d78399171fd7236d8a7622f5a00047c162ec64e1f1869cf45daac11e4482e54ac2d98f8c3391 + languageName: node + linkType: hard + "stack-utils@npm:^1.0.1": version: 1.0.2 resolution: "stack-utils@npm:1.0.2" @@ -22870,6 +23055,13 @@ __metadata: languageName: node linkType: hard +"text-hex@npm:1.0.x": + version: 1.0.0 + resolution: "text-hex@npm:1.0.0" + checksum: e0ee87d183654b5d296db1c78bed11ce980cdad1e65852d8a5743397568eb7efd125d3c04540c06be1035c90b4910a959684fcc27e1b7aacc2005fc81a9f2535 + languageName: node + linkType: hard + "text-table@npm:^0.2.0": version: 0.2.0 resolution: "text-table@npm:0.2.0" @@ -23269,6 +23461,13 @@ __metadata: languageName: node linkType: hard +"triple-beam@npm:^1.2.0, triple-beam@npm:^1.3.0": + version: 1.3.0 + resolution: "triple-beam@npm:1.3.0" + checksum: 806ab08b30481cddc9600407e18e5deec5e80557042162fd7759d9419d33877506b21ebbc6646aaa4d3e44e10eb99445f05751044e176d6b0d7211355cce587b + languageName: node + linkType: hard + "trough@npm:^1.0.0": version: 1.0.5 resolution: "trough@npm:1.0.5" @@ -25054,6 +25253,33 @@ typescript@^4.0.2: languageName: node linkType: hard +"winston-transport@npm:^4.4.0": + version: 4.4.0 + resolution: "winston-transport@npm:4.4.0" + dependencies: + readable-stream: ^2.3.7 + triple-beam: ^1.2.0 + checksum: 16050844d2636f4eb1458c0ab9df78d61cda26edcc66a7ee9fe157068080e7fd39e85082c4a4be89080194407bc91bfdd691e85a15eb079e021d0e4894ebfd45 + languageName: node + linkType: hard + +"winston@npm:*, winston@npm:^3.2.0": + version: 3.3.3 + resolution: "winston@npm:3.3.3" + dependencies: + "@dabh/diagnostics": ^2.0.2 + async: ^3.1.0 + is-stream: ^2.0.0 + logform: ^2.2.0 + one-time: ^1.0.0 + readable-stream: ^3.4.0 + stack-trace: 0.0.x + triple-beam: ^1.3.0 + winston-transport: ^4.4.0 + checksum: 8a9d69c6422d420bf6728a532abb37842bc56f5fc55bd16aee6581c0728ae20bf6bae49fd55a1a42734a32856012e9b8362b19bad7b13af6ef1f19b3c89cd704 + languageName: node + linkType: hard + "word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": version: 1.2.3 resolution: "word-wrap@npm:1.2.3"