From c0559fbc2a7c80db2ff24fa0524a94c32d4b3105 Mon Sep 17 00:00:00 2001 From: Jun Jiang Date: Mon, 6 Sep 2021 05:14:13 +0800 Subject: [PATCH] Khala para2 & update typedefs (#6073) * Update Phala typedefs * Replace Khala Para1 with Para2 testnet --- packages/apps-config/package.json | 2 +- packages/apps-config/src/api/spec/index.ts | 8 ++----- packages/apps-config/src/api/spec/khala.ts | 8 +++++++ .../src/api/spec/phala-parachain.ts | 21 ------------------- packages/apps-config/src/api/spec/phala.ts | 21 ------------------- packages/apps-config/src/endpoints/testing.ts | 14 ++++++------- yarn.lock | 12 ++++++----- 7 files changed, 25 insertions(+), 61 deletions(-) create mode 100644 packages/apps-config/src/api/spec/khala.ts delete mode 100644 packages/apps-config/src/api/spec/phala-parachain.ts delete mode 100644 packages/apps-config/src/api/spec/phala.ts diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index e29e008022..6d2b12893c 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -20,7 +20,7 @@ "@kiltprotocol/type-definitions": "0.1.14", "@laminar/type-definitions": "0.3.1", "@parallel-finance/type-definitions": "1.1.2", - "@phala/typedefs": "0.2.14", + "@phala/typedefs": "0.2.20", "@polkadot/networks": "^7.3.1", "@polymathnetwork/polymesh-types": "0.0.2", "@snowfork/snowbridge-types": "0.2.5", diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index be7cddd2cb..7e084d962e 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -48,6 +48,7 @@ import interbtc from './interbtc'; import ipse from './ipse'; import jupiter from './jupiter'; import jupiterRococo from './jupiter-rococo'; +import khala from './khala'; import kilt from './kilt'; import konomi from './konomi'; import kpron from './kpron'; @@ -67,8 +68,6 @@ import origintrail from './origintrail'; import pangolin from './pangolin'; import parallel from './parallel'; import parami from './parami'; -import phala from './phala'; -import phalaParachain from './phala-parachain'; import phoenix from './phoenix'; import plasm from './plasm'; import plasmParachain from './plasm-parachain'; @@ -160,7 +159,7 @@ const spec: Record = { 'ipse-node': ipse, 'jupiter-prep': jupiter, 'jupiter-rococo': jupiterRococo, - khala: phalaParachain, + khala, 'kilt-parachain': kilt, 'kilt-spiritnet': kilt, kintsugi: interbtc, @@ -188,9 +187,6 @@ const spec: Record = { opportunity, 'origintrail-parachain': origintrail, parami, - 'phala-collator': phalaParachain, - 'phala-node': phala, - 'phale-node': phala, 'phoenix-node': phoenix, 'phoenix-parachain': phoenix, plasm, diff --git a/packages/apps-config/src/api/spec/khala.ts b/packages/apps-config/src/api/spec/khala.ts new file mode 100644 index 0000000000..aeadfdaabd --- /dev/null +++ b/packages/apps-config/src/api/spec/khala.ts @@ -0,0 +1,8 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { OverrideBundleDefinition } from '@polkadot/types/types'; + +import { versionedKhala } from '@phala/typedefs'; + +export default versionedKhala as OverrideBundleDefinition; diff --git a/packages/apps-config/src/api/spec/phala-parachain.ts b/packages/apps-config/src/api/spec/phala-parachain.ts deleted file mode 100644 index 49ebac6a98..0000000000 --- a/packages/apps-config/src/api/spec/phala-parachain.ts +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { OverrideBundleDefinition } from '@polkadot/types/types'; - -import { poc4 } from '@phala/typedefs'; - -// structs need to be in order -/* eslint-disable sort-keys */ - -const definitions: OverrideBundleDefinition = { - types: [ - { - // on all versions - minmax: [0, undefined], - types: poc4 - } - ] -}; - -export default definitions; diff --git a/packages/apps-config/src/api/spec/phala.ts b/packages/apps-config/src/api/spec/phala.ts deleted file mode 100644 index 49ebac6a98..0000000000 --- a/packages/apps-config/src/api/spec/phala.ts +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import type { OverrideBundleDefinition } from '@polkadot/types/types'; - -import { poc4 } from '@phala/typedefs'; - -// structs need to be in order -/* eslint-disable sort-keys */ - -const definitions: OverrideBundleDefinition = { - types: [ - { - // on all versions - minmax: [0, undefined], - types: poc4 - } - ] -}; - -export default definitions; diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index f4760289ea..2f410352d4 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -67,13 +67,6 @@ export function createTesting (t: TFunction, firstOnly: boolean, withSort: boole Parity: 'wss://canvas-rpc.parity.io' } }, - { - info: 'phala', - text: t('rpc.test.phala', 'Chala (Para1)', { ns: 'apps-config' }), - providers: { - 'Phala Network': 'wss://chala-api.phala.network/ws/' - } - }, { info: 'clover', isDisabled: true, // Cannot construct unknown type BridgeNetworks @@ -218,6 +211,13 @@ export function createTesting (t: TFunction, firstOnly: boolean, withSort: boole Patract: 'wss://ws.jupiter-poa.patract.cn' } }, + { + info: 'phala', + text: t('rpc.test.phala', 'Khala (Para2)', { ns: 'apps-config' }), + providers: { + 'Phala Network': 'wss://para2-api.phala.network/ws/' + } + }, { info: 'kilt', text: t('rpc.test.kilt', 'KILT Mashnet', { ns: 'apps-config' }), diff --git a/yarn.lock b/yarn.lock index c0e8e46bee..ddbc9614cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2491,10 +2491,12 @@ __metadata: languageName: node linkType: hard -"@phala/typedefs@npm:0.2.14": - version: 0.2.14 - resolution: "@phala/typedefs@npm:0.2.14" - checksum: 32a3064aba8e09ea07fa1ace6eba62efcca53b694f1c99e6b28a3aa7bf0dfc377388fc462a2be74f6a19fc89b43141e913ee63cd22b5f2bc8584d2ac7c58ee44 +"@phala/typedefs@npm:0.2.20": + version: 0.2.20 + resolution: "@phala/typedefs@npm:0.2.20" + dependencies: + "@polkadot/types": ^5.7.1 + checksum: d83cbe8f1db3f1f2a82e1924a7e9036e300c14b3e65ec0e912f4daec8ad1409bb474f19d50d0b47bad7a4c82a6e3a4b6c0701c1faaa6005764c59f9e675cd545 languageName: node linkType: hard @@ -2824,7 +2826,7 @@ __metadata: "@kiltprotocol/type-definitions": 0.1.14 "@laminar/type-definitions": 0.3.1 "@parallel-finance/type-definitions": 1.1.2 - "@phala/typedefs": 0.2.14 + "@phala/typedefs": 0.2.20 "@polkadot/networks": ^7.3.1 "@polymathnetwork/polymesh-types": 0.0.2 "@snowfork/snowbridge-types": 0.2.5