From 45cd633c20533a74a7fb70773c2323ff94cda6ff Mon Sep 17 00:00:00 2001 From: h4x3rotab Date: Sat, 15 May 2021 01:45:47 +0800 Subject: [PATCH] Add Khala Network Kusama paraid (#5285) --- packages/apps-config/package.json | 2 +- .../src/api/spec/phala-parachain.ts | 59 +------------------ packages/apps-config/src/api/spec/phala.ts | 31 +--------- .../src/endpoints/productionRelayKusama.ts | 8 +++ .../apps/public/locales/en/apps-config.json | 1 + yarn.lock | 4 +- 6 files changed, 18 insertions(+), 87 deletions(-) diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index d39827718e..c3fddf82fe 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -16,7 +16,7 @@ "@interlay/polkabtc-types": "^0.6.2", "@kiltprotocol/type-definitions": "^0.1.3", "@laminar/type-definitions": "^0.3.1", - "@phala/typedefs": "0.1.1", + "@phala/typedefs": "^0.1.1", "@polkadot/networks": "^6.3.2-13", "@polymathnetwork/polymesh-types": "^0.0.2", "@snowfork/snowbridge-types": "^0.2.3", diff --git a/packages/apps-config/src/api/spec/phala-parachain.ts b/packages/apps-config/src/api/spec/phala-parachain.ts index 7ef2884002..49ebac6a98 100644 --- a/packages/apps-config/src/api/spec/phala-parachain.ts +++ b/packages/apps-config/src/api/spec/phala-parachain.ts @@ -3,6 +3,8 @@ import type { OverrideBundleDefinition } from '@polkadot/types/types'; +import { poc4 } from '@phala/typedefs'; + // structs need to be in order /* eslint-disable sort-keys */ @@ -11,62 +13,7 @@ const definitions: OverrideBundleDefinition = { { // on all versions minmax: [0, undefined], - types: { - Address: 'MultiAddress', - LookupSource: 'MultiAddress', - EthereumAddress: 'H160', - EcdsaSignature: '[u8; 65]', - EthereumTxHash: 'H256', - WorkerStateEnum: { - _enum: { - Empty: null, - Free: null, - Gatekeeper: null, - MiningPending: null, - Mining: 'BlockNumber', - MiningStopping: null - } - }, - WorkerInfo: { - machineId: 'Vec', - pubkey: 'Vec', - lastUpdated: 'u64', - state: 'WorkerStateEnum', - score: 'Option' - }, - Score: { - overallScore: 'u32', - features: 'Vec' - }, - StashInfo: { - controller: 'AccountId', - payoutPrefs: 'PayoutPrefs' - }, - PayoutPrefs: { - commission: 'u32', - target: 'AccountId' - }, - BlockRewardInfo: { - seed: 'U256', - onlineTarget: 'U256', - computeTarget: 'U256' - }, - RoundInfo: { - round: 'u32', - startBlock: 'BlockNumber' - }, - RoundStats: { - round: 'u32', - onlineWorkers: 'u32', - computeWorkers: 'u32', - fracTargetOnlineReward: 'u32', - totalPower: 'u32' - }, - MinerStatsDelta: { - numWorker: 'i32', - numPower: 'i32' - } - } + types: poc4 } ] }; diff --git a/packages/apps-config/src/api/spec/phala.ts b/packages/apps-config/src/api/spec/phala.ts index e9f632ce35..49ebac6a98 100644 --- a/packages/apps-config/src/api/spec/phala.ts +++ b/packages/apps-config/src/api/spec/phala.ts @@ -3,6 +3,8 @@ import type { OverrideBundleDefinition } from '@polkadot/types/types'; +import { poc4 } from '@phala/typedefs'; + // structs need to be in order /* eslint-disable sort-keys */ @@ -11,34 +13,7 @@ const definitions: OverrideBundleDefinition = { { // on all versions minmax: [0, undefined], - types: { - EcdsaSignature: '[u8; 65]', - EthereumAddress: 'H160', - EthereumTxHash: 'H256', - MiningInfo: { - isMining: 'bool', - startBlock: 'Option' - }, - PayoutPrefs: { - commission: 'u32', - target: 'AccountId' - }, - Score: { - features: 'Vec', - overallScore: 'u32' - }, - StashInfo: { - controller: 'AccountId', - payoutPrefs: 'PayoutPrefs' - }, - WorkerInfo: { - machineId: 'Vec', - pubkey: 'Vec', - lastUpdated: 'u64', - score: 'Option', - status: 'i32' - } - } + types: poc4 } ] }; diff --git a/packages/apps-config/src/endpoints/productionRelayKusama.ts b/packages/apps-config/src/endpoints/productionRelayKusama.ts index 54e6eda6f2..4ae038cadc 100644 --- a/packages/apps-config/src/endpoints/productionRelayKusama.ts +++ b/packages/apps-config/src/endpoints/productionRelayKusama.ts @@ -27,6 +27,14 @@ export function createKusama (t: TFunction): EndpointOption { linked: [ // parachains with id, see Rococo // alphabetical based on chain name + { + info: 'khala', + paraId: 2004, + text: t('rpc.kusama.khala', 'Khala Network', { ns: 'apps-config' }), + providers: { + Phala: 'wss://khala.phala.network/ws' + } + } ] }; } diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index 27354bf7cb..b610091bb5 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -49,6 +49,7 @@ "rpc.konomi": "Konomi", "rpc.kulupu": "Kulupu", "rpc.kusama.ava": "Kusama", + "rpc.kusama.khala": "Khala Network", "rpc.kusama.onfinality": "Kusama", "rpc.kusama.parity": "Kusama", "rpc.kusama.patractlabs": "Kusama", diff --git a/yarn.lock b/yarn.lock index a7d8685128..17009c136d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2190,7 +2190,7 @@ __metadata: languageName: node linkType: hard -"@phala/typedefs@npm:0.1.1": +"@phala/typedefs@npm:^0.1.1": version: 0.1.1 resolution: "@phala/typedefs@npm:0.1.1" checksum: 26b06223cf4d207f85caab332f345954f6a28bf437b2b24853d1a80e0e857aa7616fe991f50ad3fdfeda17b13f2b34c5037e4fa5f397864bc56da5bce8d42cbf @@ -2523,7 +2523,7 @@ __metadata: "@interlay/polkabtc-types": ^0.6.2 "@kiltprotocol/type-definitions": ^0.1.3 "@laminar/type-definitions": ^0.3.1 - "@phala/typedefs": 0.1.1 + "@phala/typedefs": ^0.1.1 "@polkadot/networks": ^6.3.2-13 "@polymathnetwork/polymesh-types": ^0.0.2 "@snowfork/snowbridge-types": ^0.2.3