diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 380ab5fbd1..76b12a74b9 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -38,7 +38,7 @@ "@polymathnetwork/polymesh-types": "0.0.2", "@snowfork/snowbridge-types": "0.2.7", "@sora-substrate/type-definitions": "1.8.6", - "@subsocial/types": "0.6.5", + "@subsocial/types": "0.6.8", "@unique-nft/types": "0.3.1", "@zeitgeistpm/type-defs": "0.4.5", "@zeroio/type-definitions": "0.0.14", diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 66d92a6574..d4d42c5a9e 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -164,7 +164,6 @@ const spec: Record = { 'crown-sterling': crownSterlingChain, crust, 'crust-parachain': crust, - 'cumulus-subsocial-parachain': subsocial, 'cumulus-test-parachain': testPara, datahighway: westlake, 'datahighway-parachain': datahighwayParachain, diff --git a/packages/apps-config/src/api/spec/subsocial.ts b/packages/apps-config/src/api/spec/subsocial.ts index b44890f765..f92cb589af 100644 --- a/packages/apps-config/src/api/spec/subsocial.ts +++ b/packages/apps-config/src/api/spec/subsocial.ts @@ -4,6 +4,8 @@ // We only load the definitions here explicitly - if we try to go via // import { types } from '@subsocial/types/substrate'; // we end up with multiple version of types/API -import definitions from '@subsocial/types/substrate/interfaces/subsocial/definitions'; +import { types } from '@subsocial/types'; -export default definitions; +export default { + types +}; diff --git a/packages/apps-config/src/endpoints/productionRelayKusama.ts b/packages/apps-config/src/endpoints/productionRelayKusama.ts index 76fb0911ab..b5952cec6d 100644 --- a/packages/apps-config/src/endpoints/productionRelayKusama.ts +++ b/packages/apps-config/src/endpoints/productionRelayKusama.ts @@ -401,10 +401,10 @@ export function createKusama (t: TFunction): EndpointOption { } }, { - info: 'subsocial', + info: 'subsocialX', homepage: 'https://subsocial.network/', paraId: 2100, - text: t('rpc.kusama.subsocial', 'Subsocial', { ns: 'apps-config' }), + text: t('rpc.kusama.subsocial', 'SubsocialX', { ns: 'apps-config' }), providers: { Dappforce: 'wss://para.subsocial.network' } diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index 43fa1c8ce1..1ea30aeec2 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -472,6 +472,13 @@ export function createTesting (t: TFunction, firstOnly: boolean, withSort: boole Snowfork: 'wss://parachain-rpc.snowbridge.network' } }, + { + info: 'soonsocial', + text: t('rpc.test.subsocial', 'Soonsocial', { ns: 'apps-config' }), + providers: { + DappForce: 'wss://testnet.subsocial.network' + } + }, { info: 'sora-substrate', isDisabled: true, // https://github.com/polkadot-js/apps/issues/7093 diff --git a/packages/apps-config/src/endpoints/testingRelayRococo.ts b/packages/apps-config/src/endpoints/testingRelayRococo.ts index 45ab47b9f4..5f5c6bd845 100644 --- a/packages/apps-config/src/endpoints/testingRelayRococo.ts +++ b/packages/apps-config/src/endpoints/testingRelayRococo.ts @@ -324,6 +324,14 @@ export function createRococo (t: TFunction): EndpointOption { 'Kylin Network': 'wss://rpc.kylin-node.co.uk' } }, + { + info: 'rococoSubsocial', + paraId: 2100, + text: t('rpc.rococo.subsocial', 'SoonsocialX', { ns: 'apps-config' }), + providers: { + DappForce: 'wss://rco-para.subsocial.network' + } + }, { info: 'rococoSpreehafen', paraId: 2116, @@ -512,15 +520,6 @@ export function createRococo (t: TFunction): EndpointOption { SubDAONetwork: 'wss://parachain.subdao.network' } }, - { - info: 'rococoSubsocial', - isDisabled: true, // Rococo reset - paraId: 28, - text: t('rpc.rococo.subsocial', 'Subsocial PC1', { ns: 'apps-config' }), - providers: { - DappForce: 'wss://roc.subsocial.network' - } - }, { info: 'rococoTrustBase', isDisabled: true, // Rococo reset diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts index 54c4eb672c..9835be4bd2 100644 --- a/packages/apps-config/src/ui/colors.ts +++ b/packages/apps-config/src/ui/colors.ts @@ -131,7 +131,6 @@ const chainUniarts = 'linear-gradient(150deg, #333ef7 0%, #55adff 100%)'; const chainUnique = '#40BCFF'; const chainIdavoll = '#ff43ff'; const chainSubDAO = 'linear-gradient(50deg, #F20092 0%, #FF4D5D 100%)'; -const chainSubsocial = '#b9018c'; const chainSwapdex = '#E94082'; const chainTinker = '#161616'; const chainTrustBase = '#ff43aa'; @@ -203,6 +202,7 @@ const nodeSora = '#2D2926'; const nodeStafi = '#00F3AB'; const nodeSubDAO = 'linear-gradient(50deg, #F20092 0%, #FF4D5D 100%)'; const nodeSubsocial = '#b9018c'; +const nodeSubsocialX = '#69058C'; const nodeSubspace = '#562b8e'; const nodeSwapdex = '#E94082'; const nodeTernoa = '#d622ff'; @@ -406,7 +406,6 @@ export const chainColors: Record = Object.entries({ subgame: nodeSubGame, 'SubGame Gamma': nodeSubGame, 'SubGame Staging': nodeSubGame, - 'Subsocial PC1': chainSubsocial, Subspace: nodeSubspace, swapdex: chainSwapdex, Tick: chainRoccoTick, @@ -518,6 +517,7 @@ export const nodeColors = Object.entries({ subgame: nodeSubGame, 'SubGame Gamma': nodeSubGame, 'SubGame Staging': nodeSubGame, + 'Subsocial Collator': nodeSubsocialX, 'subsocial node': nodeSubsocial, Subspace: nodeSubspace, 'subzero node': nodeZero, diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index e0c072c09e..bdf228b2a5 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -162,12 +162,15 @@ import nodeShadow from './nodes/shadow.svg'; import nodeShell from './nodes/shell.svg'; import nodeSherpax from './nodes/sherpax.png'; import nodeSingLavender from './nodes/singlavender.svg'; +import nodeSoonsocial from './nodes/soonsocial.png'; +import nodeSoonsocialX from './nodes/soonsocialX.png'; import nodeSora from './nodes/sora-substrate.svg'; import nodeStafi from './nodes/stafi.png'; import nodeStatemine from './nodes/statemine.svg'; import nodeSubDAO from './nodes/subdao.png'; import nodeSubGame from './nodes/subgame.svg'; import nodeSubsocial from './nodes/subsocial.svg'; +import nodeSubsocialX from './nodes/subsocialX.svg'; import nodeSubspace from './nodes/subspace.png'; import nodeSubstrateContractsNode from './nodes/substrate-contracts-node.png'; import nodeSubstrate from './nodes/substrate-hexagon.svg'; @@ -337,6 +340,8 @@ export const chainLogos = Object.entries({ 'Sherpax Testnet': nodeSherpax, Shiden: chainShiden, SingLavender: nodeSingLavender, + soonsocial: nodeSoonsocial, + soonsocialX: nodeSoonsocialX, SORA: nodeSora, 'SORA Kusama': nodeSora, Spanner: chainSpanner, @@ -350,8 +355,8 @@ export const chainLogos = Object.entries({ subgame: nodeSubGame, 'SubGame Gamma': nodeSubGame, 'SubGame Staging': nodeSubGame, - Subsocial: nodeSubsocial, - 'Subsocial PC': nodeSubsocial, + subsocial: nodeSubsocial, + subsocialX: nodeSubsocialX, subspace: nodeSubspace, swapdex: nodeSwapdex, Tick: chainRococoTick, @@ -531,9 +536,6 @@ export const nodeLogos = Object.entries({ subgame: nodeSubGame, 'SubGame Gamma': nodeSubGame, 'SubGame Staging': nodeSubGame, - 'Subsocial Node': nodeSubsocial, - 'Subsocial PC': nodeSubsocial, - 'subsocial-node': nodeSubsocial, subspace: nodeSubspace, 'substrate-contracts-node': nodeSubstrateContractsNode, 'substrate-node': nodeSubstrate, @@ -751,7 +753,7 @@ export const namedLogos: Record = { rococoStandard: chainStandard, rococoStatemint: nodeStatemine, rococoSubDAO: nodeSubDAO, - rococoSubsocial: nodeSubsocial, + rococoSubsocial: nodeSoonsocialX, rococoTick: chainRococoTick, rococoTinker: chainTinker, rococoTrack: chainRococoTrack, @@ -769,6 +771,7 @@ export const namedLogos: Record = { shiden: chainShiden, singLavender: nodeSingLavender, snakenet: chainSnakenet, + soonsocial: nodeSoonsocial, sora: nodeSora, 'sora-substrate': nodeSora, sora_ksm: nodeSora, @@ -783,6 +786,7 @@ export const namedLogos: Record = { 'SubGame Gamma': nodeSubGame, 'SubGame Staging': nodeSubGame, subsocial: nodeSubsocial, + subsocialX: nodeSubsocialX, subspace: nodeSubspace, 'subspace-farmnet': nodeSubspace, substrate: nodeSubstrate, diff --git a/packages/apps-config/src/ui/logos/nodes/soonsocial.png b/packages/apps-config/src/ui/logos/nodes/soonsocial.png new file mode 100644 index 0000000000..70a9189dbe Binary files /dev/null and b/packages/apps-config/src/ui/logos/nodes/soonsocial.png differ diff --git a/packages/apps-config/src/ui/logos/nodes/soonsocialX.png b/packages/apps-config/src/ui/logos/nodes/soonsocialX.png new file mode 100644 index 0000000000..e4caaa5b77 Binary files /dev/null and b/packages/apps-config/src/ui/logos/nodes/soonsocialX.png differ diff --git a/packages/apps-config/src/ui/logos/nodes/subsocialX.svg b/packages/apps-config/src/ui/logos/nodes/subsocialX.svg new file mode 100644 index 0000000000..6249b7edce --- /dev/null +++ b/packages/apps-config/src/ui/logos/nodes/subsocialX.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index 10f477515f..2cb99a588c 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -53,7 +53,7 @@ "rpc.kusama.standard": "Unorthodox", "rpc.kusama.statemine": "Statemine", "rpc.kusama.subgame": "SubGame Gamma", - "rpc.kusama.subsocial": "Subsocial", + "rpc.kusama.subsocial": "SubsocialX", "rpc.kusama.tanganika": "Tanganika", "rpc.kusama.trustbase": "TrustBase", "rpc.kusama.zeitgeist": "Zeitgeist", @@ -174,7 +174,7 @@ "rpc.rococo.standard": "Standard", "rpc.rococo.statemint": "Statemint", "rpc.rococo.subdao": "SubDAO PC1", - "rpc.rococo.subsocial": "Subsocial PC1", + "rpc.rococo.subsocial": "SoonsocialX", "rpc.rococo.tick": "Tick", "rpc.rococo.tinker": "InvArch Tinkernet", "rpc.rococo.track": "Track", @@ -245,6 +245,7 @@ "rpc.test.subgame": "SubGame Staging", "rpc.test.subspace": "Subspace Testnet", "rpc.test.subspace.farmnet": "Subspace Farmnet", + "rpc.test.subsocial": "Soonsocial", "rpc.test.ternoa-testnet": "Ternoa Testnet", "rpc.test.turbulence": "Turbulence", "rpc.test.uniarts": "UniArts", diff --git a/packages/apps/public/locales/ru/translation.json b/packages/apps/public/locales/ru/translation.json index 16eb009b3c..4aa83deb94 100644 --- a/packages/apps/public/locales/ru/translation.json +++ b/packages/apps/public/locales/ru/translation.json @@ -1792,7 +1792,7 @@ "rpc.kusama.standard": "Unorthodox", "rpc.kusama.statemine": "Statemine", "rpc.kusama.subgame": "SubGame Gamma", - "rpc.kusama.subsocial": "Subsocial", + "rpc.kusama.subsocial": "SubsocialX", "rpc.kusama.trustbase": "TrustBase", "rpc.kusama.w3f": "Kusama (Polkadot Canary, hosted by Web3 Foundation)", "rpc.kusama.zeitgeist": "Zeitgeist", diff --git a/yarn.lock b/yarn.lock index d39508bdb5..19324487b8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2972,7 +2972,7 @@ __metadata: "@polymathnetwork/polymesh-types": 0.0.2 "@snowfork/snowbridge-types": 0.2.7 "@sora-substrate/type-definitions": 1.8.6 - "@subsocial/types": 0.6.5 + "@subsocial/types": 0.6.8 "@unique-nft/types": 0.3.1 "@zeitgeistpm/type-defs": 0.4.5 "@zeroio/type-definitions": 0.0.14 @@ -3965,27 +3965,40 @@ __metadata: languageName: node linkType: hard -"@subsocial/types@npm:0.6.5": - version: 0.6.5 - resolution: "@subsocial/types@npm:0.6.5" +"@subsocial/definitions@npm:0.6.8": + version: 0.6.8 + resolution: "@subsocial/definitions@npm:0.6.8" dependencies: - "@polkadot/types": 6.9.2 - "@polkadot/types-known": 6.9.2 - "@polkadot/types-support": 6.9.2 - "@subsocial/utils": ^0.6.5 - cids: ^0.7.1 - checksum: 4a02a6a19c449bab19b6ecbac89359562e1461c76020d5f4b53a1dc9471f361f0f2f364ab48c3c852a1b8db3cd82cdbc0b6bbf08cbe268038907cbc7ca2697f3 + "@polkadot/api": latest + lodash.camelcase: ^4.3.0 + checksum: 03d8bea55f19d0fe2f8d8ee8f51a4506e6b550dd33ae5e3734b32906df48405bfac05ea2095d8b41ad3f2caeeb67e87614d67f89ab71ca090f7d579b05e104e0 languageName: node linkType: hard -"@subsocial/utils@npm:^0.6.5": - version: 0.6.5 - resolution: "@subsocial/utils@npm:0.6.5" +"@subsocial/types@npm:0.6.8": + version: 0.6.8 + resolution: "@subsocial/types@npm:0.6.8" dependencies: - "@polkadot/util-crypto": 7.8.2 + "@polkadot/types": latest + "@polkadot/types-known": latest + "@polkadot/types-support": latest + "@subsocial/definitions": 0.6.8 + "@subsocial/utils": 0.6.8 + cids: ^0.7.1 + checksum: ef7a6dd218e70c3df6fa4b6d157aefece5ea11427f7bd0753a9cdf8fececade57cee3ff7c7c8ae53514c0b953e69204d4e057abefd9157d1c998415b9b0ab9ba + languageName: node + linkType: hard + +"@subsocial/utils@npm:0.6.8": + version: 0.6.8 + resolution: "@subsocial/utils@npm:0.6.8" + dependencies: + "@polkadot/util-crypto": ^8.4.1 "@sindresorhus/slugify": ^1.1.0 + bignumber.js: ^9.0.1 bn.js: ^5.1.1 chalk: ^3.0.0 + dayjs: ^1.10.7 lodash.isempty: ^4.4.0 lodash.memoize: ^4.1.2 lodash.truncate: ^4.4.2 @@ -3995,7 +4008,7 @@ __metadata: remark-gfm: ^1.0.0 remark-html: ^13.0.1 strip-markdown: ^4.0.0 - checksum: e303c6c8d5fa8ece95779800cf469084e5654c771119f049c1041a91e6a575420b885120e4e0bfea691d14919ce3dbb8e53ac612f26910cc9bc876f4ee149161 + checksum: 5a80dbcf193a5be774227f4d7eee724202d52f85b25a0ca92f93a081b35f26b2b198ac3c98d8151a19d192c89b96141d265d58223da6e70d679bdaf34b32e6ab languageName: node linkType: hard @@ -6309,6 +6322,13 @@ __metadata: languageName: node linkType: hard +"bignumber.js@npm:^9.0.1": + version: 9.0.2 + resolution: "bignumber.js@npm:9.0.2" + checksum: 8637b71d0a99104b20413c47578953970006fec6b4df796b9dcfd9835ea9c402ea0e727eba9a5ca9f9a393c1d88b6168c5bbe0887598b708d4f8b4870ad62e1f + languageName: node + linkType: hard + "binary-extensions@npm:^2.0.0": version: 2.1.0 resolution: "binary-extensions@npm:2.1.0" @@ -8033,6 +8053,13 @@ __metadata: languageName: node linkType: hard +"dayjs@npm:^1.10.7": + version: 1.11.0 + resolution: "dayjs@npm:1.11.0" + checksum: 2d36f6d71345114cdcd89147adf9e05b4f8fe81684e08c8bf1f86b140aa0b86ecc3cae661a9348d96feb7fbefd03e1bc3697303688e95209670abcb36b4ece15 + languageName: node + linkType: hard + "debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.6.8, debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9"