From 918d3521baf248ec2e9a8dfec143fc41dc857bb9 Mon Sep 17 00:00:00 2001 From: Masterdubs Date: Fri, 7 May 2021 15:18:37 +0400 Subject: [PATCH] update and clean galital standalone chain specs and type (#5225) * Add PC to galital for clarity * update galital parachain ID * Galital independant testnet * update and clean galital standalone chain specs and type * Fix galital mapping --- .../src/api/spec/galital-parachain.ts | 70 +++++++++++++++++++ packages/apps-config/src/api/spec/galital.ts | 16 +++-- packages/apps-config/src/api/spec/index.ts | 4 +- packages/apps-config/src/endpoints/testing.ts | 5 +- packages/apps-config/src/ui/colors.ts | 1 + .../apps/public/locales/en/apps-config.json | 1 + 6 files changed, 87 insertions(+), 10 deletions(-) create mode 100644 packages/apps-config/src/api/spec/galital-parachain.ts diff --git a/packages/apps-config/src/api/spec/galital-parachain.ts b/packages/apps-config/src/api/spec/galital-parachain.ts new file mode 100644 index 0000000000..a629c50e9d --- /dev/null +++ b/packages/apps-config/src/api/spec/galital-parachain.ts @@ -0,0 +1,70 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { OverrideBundleDefinition } from '@polkadot/types/types'; + +// structs need to be in order +/* eslint-disable sort-keys */ + +const definitions: OverrideBundleDefinition = { + types: [ + { + // on all versions + minmax: [0, undefined], + types: { + Address: 'AccountId', + LookupSource: 'AccountId', + Account: { + nonce: 'U256', + balance: 'U256' + }, + Transaction: { + nonce: 'U256', + action: 'String', + gas_price: 'u64', + gas_limit: 'u64', + value: 'U256', + input: 'Vec', + signature: 'Signature' + }, + Signature: { + v: 'u64', + r: 'H256', + s: 'H256' + }, + ClassId: 'u64', + TokenId: 'u64', + ClassData: 'Vec', + TokenData: 'Vec', + ReportReason: { + _enum: [ + 'None', + 'Illigal', + 'Plagiarism', + 'Duplicate', + 'Reported' + ] + }, + ClassInfoOf: { + metadata: 'Vec', + total_issuance: 'TokenId', + + owner: 'AccountId', + class_data: 'ClassData' + }, + ExtendedInfo: { + display_flag: 'bool', + report: 'ReportReason', + frozen: 'bool' + }, + TokenInfoOf: { + metadata: 'Vec', + owner: 'AccountId', + class_data: 'ClassData' + } + } + } + ] +}; + +export default definitions; diff --git a/packages/apps-config/src/api/spec/galital.ts b/packages/apps-config/src/api/spec/galital.ts index a629c50e9d..cd08c84a6b 100644 --- a/packages/apps-config/src/api/spec/galital.ts +++ b/packages/apps-config/src/api/spec/galital.ts @@ -12,8 +12,8 @@ const definitions: OverrideBundleDefinition = { // on all versions minmax: [0, undefined], types: { - Address: 'AccountId', - LookupSource: 'AccountId', + Address: 'MultiAddress', + LookupSource: 'MultiAddress', Account: { nonce: 'U256', balance: 'U256' @@ -27,10 +27,14 @@ const definitions: OverrideBundleDefinition = { input: 'Vec', signature: 'Signature' }, - Signature: { - v: 'u64', - r: 'H256', - s: 'H256' + ChainId: 'u8', + ResourceId: '[u8; 32]', + DepositNonce: 'u64', + ProposalVotes: { + votes_for: 'Vec', + votes_against: 'Vec', + status: 'u8', + expiry: 'U256' }, ClassId: 'u64', TokenId: 'u64', diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index 494324fd30..caa65d0e26 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -31,6 +31,7 @@ import encointerNodeTeeproxy from './encointer-node-teeproxy'; import encointerPara from './encointer-para'; import equilibrium from './equilibrium'; import galital from './galital'; +import galitalParachain from './galital-parachain'; import galois from './galois'; import gamepower from './gamepower'; import hanonycash from './hanonycash'; @@ -121,7 +122,8 @@ const spec: Record = { 'encointer-node-notee': encointerNodeNotee, 'encointer-node-teeproxy': encointerNodeTeeproxy, 'encointer-parachain': encointerPara, - 'galital-collator': galital, + galital: galital, + 'galital-collator': galitalParachain, gamepower, 'hack-hydra-dx': hydrate, hanonycash, diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index 0366e1bed3..fce9839007 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -139,9 +139,8 @@ export function createTesting (t: TFunction): LinkOption[] { } }, { - info: 'rococoGalital', - paraId: 1230, - text: t('rpc.rococo.galital', 'Galital PC2', { ns: 'apps-config' }), + info: 'Galital', + text: t('rpc.galital', 'Galital PC2', { ns: 'apps-config' }), providers: { StarkleyTech: 'wss://galital-rpc-testnet.starkleytech.com' } diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts index 1a7716e1e1..14ce7018f9 100644 --- a/packages/apps-config/src/ui/colors.ts +++ b/packages/apps-config/src/ui/colors.ts @@ -220,6 +220,7 @@ export const nodeColors: Record = [ ['Encointer Node noTEE', nodeEncointerNotee], ['Encointer Node TEE proxy', nodeEncointerTeeproxy], ['Equilibrium node', nodeEquilibrium], + ['Galital', nodeGalital], ['Galital Parachain Collator', nodeGalital], ['GamePower Node', nodeGamePower], ['IpseTestnet', nodeIpse], diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index 5985ac6925..dbdd2c4aaf 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -30,6 +30,7 @@ "rpc.encointer.gesell": "Encointer Gesell", "rpc.equilibrium": "Equilibrium", "rpc.equilibriumtestnet": "Equilibrium", + "rpc.galital": "Galital", "rpc.flamingfir": "Flaming Fir", "rpc.galois": "Galois", "rpc.gamepower": "GamePower",