diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 8b20658cdc..765b5a5622 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -11,7 +11,7 @@ "@babel/runtime": "^7.15.4", "@bifrost-finance/type-definitions": "1.2.26", "@crustio/type-definitions": "0.0.10", - "@darwinia/types": "1.1.7", + "@darwinia/types": "1.1.9", "@digitalnative/type-definitions": "1.1.13", "@docknetwork/node-types": "0.4.7", "@edgeware/node-types": "3.6.2-wako", diff --git a/packages/apps-config/src/api/spec/darwinia-parachain.ts b/packages/apps-config/src/api/spec/darwinia-parachain.ts deleted file mode 100644 index 0e7b06860f..0000000000 --- a/packages/apps-config/src/api/spec/darwinia-parachain.ts +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { OverrideBundleDefinition } from '@polkadot/types/types'; - -import { typesBundleForPolkadotApps } from '@darwinia/types/mix'; - -export default typesBundleForPolkadotApps.spec.Pangolin as unknown as OverrideBundleDefinition; diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index a0ecb787cb..a96ed4b886 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -22,7 +22,6 @@ import crab from './crab'; import crust from './crust'; import testPara from './cumulus-test-parachain'; import darwinia from './darwinia'; -import darwiniaParachain from './darwinia-parachain'; import datahighwayParachain from './datahighway'; import dockPoaMainnet from './dock-poa-mainnet'; import dockPoaTestnet from './dock-poa-testnet'; @@ -66,6 +65,7 @@ import oakTestnet from './oak-testnet'; import opportunity from './opportunity'; import origintrail from './origintrail'; import pangolin from './pangolin'; +import pangoro from './pangoro'; import parallel from './parallel'; import parami from './parami'; import phoenix from './phoenix'; @@ -105,11 +105,12 @@ import zero from './zero'; const spec: Record = { Crab: crab, Darwinia: darwinia, - 'Darwinia Crab PC2': darwiniaParachain, - 'Darwinia PC2': darwiniaParachain, + 'Darwinia Crab PC2': pangolin, + 'Darwinia PC2': pangolin, Equilibrium: equilibrium, Genshiro: genshiro, Pangolin: pangolin, + Pangoro: pangoro, VLN: vln, 'VLN-PC': vlnrococo, ...acala, diff --git a/packages/apps-config/src/api/spec/pangoro.ts b/packages/apps-config/src/api/spec/pangoro.ts new file mode 100644 index 0000000000..e766e451f3 --- /dev/null +++ b/packages/apps-config/src/api/spec/pangoro.ts @@ -0,0 +1,83 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import { OverrideBundleDefinition } from '@polkadot/types/types'; + +export const definitions: OverrideBundleDefinition = { + types: [{ + // on all versions + minmax: [0, undefined], + types: { + // common types + Address: 'MultiAddress', + AuthorityId: '[u8;32]', + AuthoritySignature: '[u8;64]', + BlockHash: 'PangoroBlockHash', + BridgedBlockHash: 'RialtoBlockHash', + BridgedBlockNumber: 'RialtoBlockNumber', + BridgedHeader: 'RialtoHeader', + Fee: 'PangoroBalance', + KtonBalance: 'Balance', + LookupSource: 'Address', + // Pangoro types + PangoroBalance: 'Balance', + PangoroBlockHash: 'Hash', + PangoroBlockNumber: 'BlockNumber', + PangoroDigest: { + logs: 'Vec' + }, + PangoroDigestItem: { + _enum: { + AuthoritiesChange: 'Vec', + ChangesTrieRoot: 'PangoroBlockHash', + Consensus: 'Consensus', + Other: 'Vec', + PreRuntime: 'PreRuntime', + Seal: 'Seal', + SealV0: 'SealV0' + } + }, + PangoroHeader: { + digest: 'PangoroDigest', + extrinsics_root: 'PangoroBlockHash', + number: 'Compact', + parent_Hash: 'PangoroBlockHash', + state_root: 'PangoroBlockHash' + }, + Parameter: { + _enum: { + PangoroToRialtoConversionRate: 'u128' + } + }, + Power: 'u32', + // Rialto types + RialtoBalance: 'u128', + RialtoBlockHash: 'H256', + RialtoBlockNumber: 'u32', + RialtoDigest: { + logs: 'Vec' + }, + RialtoDigestItem: { + _enum: { + AuthoritiesChange: 'Vec', + ChangesTrieRoot: 'RialtoBlockHash', + Consensus: 'Consensus', + Other: 'Vec', + PreRuntime: 'PreRuntime', + Seal: 'Seal', + SealV0: 'SealV0' + } + }, + RialtoHeader: { + digest: 'RialtoDigest', + extrinsics_root: 'RialtoBlockHash', + number: 'Compact', + parent_Hash: 'RialtoBlockHash', + state_root: 'RialtoBlockHash' + }, + RingBalance: 'Balance' + } + }] +}; + +export default definitions; diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index d9f54e93c3..6c13533544 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -314,6 +314,13 @@ export function createTesting (t: TFunction, firstOnly: boolean, withSort: boole 'Darwinia Network': 'wss://pangolin-rpc.darwinia.network' } }, + { + info: 'pangoro', + text: t('rpc.test.pangoro', 'Pangoro', { ns: 'apps-config' }), + providers: { + 'Darwinia Network': 'wss://pangoro-rpc.darwinia.network' + } + }, { info: 'phoenix', text: t('rpc.test.phoenix', 'Phoenix Mashnet', { ns: 'apps-config' }), diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts index 73af2867d6..e7bc9717e3 100644 --- a/packages/apps-config/src/ui/colors.ts +++ b/packages/apps-config/src/ui/colors.ts @@ -45,6 +45,7 @@ const chainMoonrock = '#3d1d5a'; const chainNFTMart = '#815287'; const chainOakTestnet = '#E38985'; const chainPangolin = '#5744ff'; +const chainPangoro = '#5745de'; const chainParami = '#ee06e2'; const chainPhala = '#a7e300'; const chainPhoenix = '#d42181'; @@ -130,6 +131,7 @@ const nodeOakTestnet = '#E38985'; const nodeOpportunity = '#6143bc'; const nodeOriginTrail = '#131415'; const nodePangolin = '#5744ff'; +const nodePangoro = '#5745de'; const nodeParami = '#ee06e2'; const nodePolkadex = '#7C30DD'; const nodePolymesh = '#1348e4'; @@ -243,6 +245,7 @@ export const chainColors: Record = Object.entries({ 'OriginTrail Parachain': nodeOriginTrail, 'OriginTrail Parachain Testnet': nodeOriginTrail, Pangolin: chainPangolin, + Pangoro: chainPangoro, 'Parallel Heiko': chainHeiko, 'Parami PC2': chainParami, 'Phala PC1': chainPhala, @@ -338,6 +341,7 @@ export const nodeColors = Object.entries({ 'Opportunity Standalone Testnet': nodeOpportunity, 'OriginTrail Parachain': nodeOriginTrail, Pangolin: nodePangolin, + Pangoro: nodePangoro, 'Parallel Heiko': nodeHeiko, 'Parami Collator': nodeParami, 'Patract Node': nodeJupiter, diff --git a/packages/apps-config/src/ui/logos/index.ts b/packages/apps-config/src/ui/logos/index.ts index 1f3d095efc..c6a7fee674 100644 --- a/packages/apps-config/src/ui/logos/index.ts +++ b/packages/apps-config/src/ui/logos/index.ts @@ -95,6 +95,7 @@ import oakTestnet from './nodes/oak-testnet.png'; import nodeOpportunity from './nodes/opportunity.png'; import nodeOriginTrail from './nodes/origintrail.png'; import nodePangolin from './nodes/pangolin.svg'; +import nodePangoro from './nodes/pangoro.svg'; import nodeParami from './nodes/parami.png'; import nodePhala from './nodes/phala.svg'; import nodePhoenix from './nodes/phoenix.png'; @@ -211,6 +212,7 @@ export const chainLogos = Object.entries({ 'OriginTrail Parachain': nodeOriginTrail, 'OriginTrail Parachain Testnet': nodeOriginTrail, Pangolin: nodePangolin, + Pangoro: nodePangoro, 'Parallel Heiko': chainHeiko, 'Parami PC2': nodeParami, 'Phala PC1': nodePhala, @@ -336,6 +338,7 @@ export const nodeLogos = Object.entries({ 'OriginTrail Parachain': nodeOriginTrail, 'OriginTrail Parachain Testnet': nodeOriginTrail, Pangolin: nodePangolin, + Pangoro: nodePangoro, 'Parallel Heiko': nodeHeiko, Parami: nodeParami, 'parity-polkadot': nodePolkadot, @@ -490,6 +493,7 @@ export const namedLogos: Record = { opportunity: nodeOpportunity, 'origintrail-parachain-testnet': nodeOriginTrail, pangolin: nodePangolin, + pangoro: nodePangoro, phala: nodePhala, phoenix: nodePhoenix, picasso: chainComposable, diff --git a/packages/apps-config/src/ui/logos/nodes/pangoro.svg b/packages/apps-config/src/ui/logos/nodes/pangoro.svg new file mode 100644 index 0000000000..43fc208d34 --- /dev/null +++ b/packages/apps-config/src/ui/logos/nodes/pangoro.svg @@ -0,0 +1,22 @@ + + + 编组 2 + + + + + + + + + + + + + + + + + + + \ 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 413cd3e789..438dfa9817 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -156,6 +156,7 @@ "rpc.test.opportunity": "Opportunity", "rpc.test.origintrail": "OriginTrail Parachain Testnet", "rpc.test.pangolin": "Pangolin", + "rpc.test.pangoro": "Pangoro", "rpc.test.phala": "Chala (Para1)", "rpc.test.phoenix": "Phoenix Mashnet", "rpc.test.polkadex": "Polkadex", diff --git a/packages/apps/public/locales/fr/translation.json b/packages/apps/public/locales/fr/translation.json index 7b21c7fbc8..63e2c144fc 100644 --- a/packages/apps/public/locales/fr/translation.json +++ b/packages/apps/public/locales/fr/translation.json @@ -1322,6 +1322,7 @@ "rpc.nodle-arcadia": "Arcadia (Testnet Nodle, hébergé par Nodle)", "rpc.nodle-main": "Nodle Main", "rpc.pangolin": "Pangolin", + "rpc.pangoro": "Pangoro", "rpc.phala": "Phala PoC-3", "rpc.plasm": "Plasm", "rpc.polkadot.parity": "Polkadot", diff --git a/packages/apps/public/locales/ko/translation.json b/packages/apps/public/locales/ko/translation.json index a5f04e3241..f9bb2e7a3b 100644 --- a/packages/apps/public/locales/ko/translation.json +++ b/packages/apps/public/locales/ko/translation.json @@ -1285,6 +1285,7 @@ "rpc.nodle-main": "노들 메인", "rpc.opportunity": "오퍼튜니티 (스탠다드 프로토콜 테스트넷, 스탠다드 프로토콜이 운영함)", "rpc.pangolin": "팬고린", + "rpc.pangoro": "판고로", "rpc.phala": "팔라 PoC-3", "rpc.plasm": "플라즈마", "rpc.polkadot.parity": "폴카닷", diff --git a/yarn.lock b/yarn.lock index 31fc059d14..e73783376a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1487,24 +1487,24 @@ __metadata: languageName: node linkType: hard -"@darwinia/types-known@npm:^1.1.7": - version: 1.1.7 - resolution: "@darwinia/types-known@npm:1.1.7" +"@darwinia/types-known@npm:^1.1.9": + version: 1.1.9 + resolution: "@darwinia/types-known@npm:1.1.9" dependencies: "@babel/runtime": ^7.9.6 "@polkadot/types": 4.0.4-5 "@polkadot/util": 6.0.5 bn.js: ^5.1.2 - checksum: bff508d3b9a0c7399063f8c9eba3190428278445ce1f5849d906c233c85ec08583cf34e32d5eb8766f2d184da20096c6731c22522ffe03a3d7870e4ecb575120 + checksum: 7abb4894288a6de984b8c772da84a6de4d2bb7f89c70d75ccaa72139ed3c3423261b3d478339889d3919d5f0ece6c6c6cb0e45277973d73def7bc9f0367881f7 languageName: node linkType: hard -"@darwinia/types@npm:1.1.7": - version: 1.1.7 - resolution: "@darwinia/types@npm:1.1.7" +"@darwinia/types@npm:1.1.9": + version: 1.1.9 + resolution: "@darwinia/types@npm:1.1.9" dependencies: - "@darwinia/types-known": ^1.1.7 - checksum: 0a1c61fcc6bc7fdfe417224521cbd5ddde85858445cadb13e566b9018d7ac7f1757493b3d8f7c676b699e331ef2618c6c8e4e1b0b36289982d4b1e91d9a6292e + "@darwinia/types-known": ^1.1.9 + checksum: 771cd464e5b3a14b78e09c9c936ca30422a12670fefae03bfdb4d301d53d49b6a5eabe46893ed9a81a0550d7069dead5b06e75e8d26edc067b9694c47661c7cf languageName: node linkType: hard @@ -2817,7 +2817,7 @@ __metadata: "@babel/runtime": ^7.15.4 "@bifrost-finance/type-definitions": 1.2.26 "@crustio/type-definitions": 0.0.10 - "@darwinia/types": 1.1.7 + "@darwinia/types": 1.1.9 "@digitalnative/type-definitions": 1.1.13 "@docknetwork/node-types": 0.4.7 "@edgeware/node-types": 3.6.2-wako