From 6eb6694cdbd913d303e97b08f30dbb46e242ece2 Mon Sep 17 00:00:00 2001 From: Anoymous Hentai <60800427+Anonymous-Hentai@users.noreply.github.com> Date: Wed, 21 Apr 2021 22:01:51 +0800 Subject: [PATCH] Update typedef of Phala to PoC-4 (#5111) * Add Phala PoC-4 * chore: Move @phala/typedefs to apps-config * chore: Update color --- packages/apps-config/package.json | 1 + packages/apps-config/src/api/chain/index.ts | 6 ++-- packages/apps-config/src/api/chain/phala.ts | 34 ------------------- packages/apps-config/src/endpoints/testing.ts | 4 +-- packages/apps-config/src/links/subscan.ts | 2 +- packages/apps-config/src/ui/colors.ts | 2 +- yarn.lock | 8 +++++ 7 files changed, 17 insertions(+), 40 deletions(-) delete mode 100644 packages/apps-config/src/api/chain/phala.ts diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index ba2ecf67df..7e649d9ab8 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -15,6 +15,7 @@ "@equilab/definitions": "1.0.3", "@interlay/polkabtc-types": "^0.6.2", "@laminar/type-definitions": "^0.3.1", + "@phala/typedefs": "^0.0.9", "@polkadot/networks": "^6.2.1", "@snowfork/snowbridge-types": "^0.2.3", "@sora-substrate/type-definitions": "^0.8.9", diff --git a/packages/apps-config/src/api/chain/index.ts b/packages/apps-config/src/api/chain/index.ts index 30df06da64..f5f2b0ca37 100644 --- a/packages/apps-config/src/api/chain/index.ts +++ b/packages/apps-config/src/api/chain/index.ts @@ -1,9 +1,11 @@ // Copyright 2017-2021 @polkadot/apps-config authors & contributors // SPDX-License-Identifier: Apache-2.0 -import Phala from './phala'; +import PhalaPoc3 from '@phala/typedefs/dist/phala-poc3'; +import PhalaPoc4 from '@phala/typedefs/dist/phala-poc4'; // alphabetical, based on the actual displayed name export default { - 'Phala PoC-3': Phala + 'Phala PoC-3': PhalaPoc3, + 'Phala PoC-4': PhalaPoc4 }; diff --git a/packages/apps-config/src/api/chain/phala.ts b/packages/apps-config/src/api/chain/phala.ts deleted file mode 100644 index ffe6de5464..0000000000 --- a/packages/apps-config/src/api/chain/phala.ts +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2017-2021 @polkadot/apps-config authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -// structs need to be in order -/* eslint-disable sort-keys */ - -export default { - 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' - } -}; diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index 28a3389cb9..670a59de63 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -194,9 +194,9 @@ export function createTesting (t: TFunction): LinkOption[] { }, { info: 'phala', - text: t('rpc.phala', 'Phala PoC-3', { ns: 'apps-config' }), + text: t('rpc.phala', 'Phala PoC-4', { ns: 'apps-config' }), providers: { - 'Phala Network': 'wss://poc3a.phala.network/ws' + 'Phala Network': 'wss://poc4.phala.network/ws' } }, { diff --git a/packages/apps-config/src/links/subscan.ts b/packages/apps-config/src/links/subscan.ts index f9a9d4ad42..e586bb44b4 100644 --- a/packages/apps-config/src/links/subscan.ts +++ b/packages/apps-config/src/links/subscan.ts @@ -19,7 +19,7 @@ export default { Kulupu: 'kulupu', Kusama: 'kusama', 'Laminar Turbulence TC2': 'laminar-testnet', - 'Phala PoC-3': 'phala', + 'Phala PoC-4': 'phala', Plasm: 'plasm', Polkadot: 'polkadot', Rococo: 'rococo', diff --git a/packages/apps-config/src/ui/colors.ts b/packages/apps-config/src/ui/colors.ts index 3633aaaa8a..f7e5b0a018 100644 --- a/packages/apps-config/src/ui/colors.ts +++ b/packages/apps-config/src/ui/colors.ts @@ -158,7 +158,7 @@ export const chainColors: Record = [ ['NFTMart Staging', chainNFTMart], ['Parami PC2', chainParami], ['Phala PC1', chainPhala], - ['Phala poc 3', chainPhala], + ['Phala PoC 4', chainPhala], ['Plasm', chainPlasm], ['Plasm PC2', chainPlasm], ['PolkaBTC', chainPolkabtc], diff --git a/yarn.lock b/yarn.lock index 0d9a271164..853f10c487 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2118,6 +2118,13 @@ __metadata: languageName: node linkType: hard +"@phala/typedefs@npm:^0.0.9": + version: 0.0.9 + resolution: "@phala/typedefs@npm:0.0.9" + checksum: a33e33675c7fcbc49f1bf6ba43d57e1967d7c61704d152588daba662e31701db1eaf0d50fdad4bcffcc168ef0390ffae183f5f2ef8d0836e53b7bd2152c4f6bd + languageName: node + linkType: hard + "@pinata/sdk@npm:^1.1.13": version: 1.1.13 resolution: "@pinata/sdk@npm:1.1.13" @@ -2433,6 +2440,7 @@ __metadata: "@equilab/definitions": 1.0.3 "@interlay/polkabtc-types": ^0.6.2 "@laminar/type-definitions": ^0.3.1 + "@phala/typedefs": ^0.0.9 "@polkadot/networks": ^6.2.1 "@snowfork/snowbridge-types": ^0.2.3 "@sora-substrate/type-definitions": ^0.8.9