diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index 29ae38cb2b..2a18177339 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -11,6 +11,7 @@ "@babel/runtime": "^7.14.0", "@crustio/type-definitions": "0.0.10", "@darwinia/types": "^1.1.0-alpha.21", + "@docknetwork/node-types": "^0.4.6", "@edgeware/node-types": "^3.5.1-erup-4", "@equilab/definitions": "1.1.1", "@interlay/polkabtc-types": "^0.7.3", diff --git a/packages/apps-config/src/api/spec/dock-poa-mainnet.ts b/packages/apps-config/src/api/spec/dock-poa-mainnet.ts new file mode 100644 index 0000000000..4629546c5b --- /dev/null +++ b/packages/apps-config/src/api/spec/dock-poa-mainnet.ts @@ -0,0 +1,12 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { OverrideBundleDefinition } from '@polkadot/types/types'; + +// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires +const types: any = require('@docknetwork/node-types'); + +// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access +const definitions = types.spec['dock-main-runtime'] as OverrideBundleDefinition; + +export default definitions; diff --git a/packages/apps-config/src/api/spec/dock-poa-testnet.ts b/packages/apps-config/src/api/spec/dock-poa-testnet.ts new file mode 100644 index 0000000000..80dc998ae6 --- /dev/null +++ b/packages/apps-config/src/api/spec/dock-poa-testnet.ts @@ -0,0 +1,12 @@ +// Copyright 2017-2021 @polkadot/apps-config authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { OverrideBundleDefinition } from '@polkadot/types/types'; + +// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires +const types: any = require('@docknetwork/node-types'); + +// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access +const definitions = types.spec['dock-test-runtime'] as OverrideBundleDefinition; + +export default definitions; diff --git a/packages/apps-config/src/api/spec/dock.ts b/packages/apps-config/src/api/spec/dock.ts deleted file mode 100644 index 25d07b1552..0000000000 --- a/packages/apps-config/src/api/spec/dock.ts +++ /dev/null @@ -1,138 +0,0 @@ -// 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', - Keys: 'SessionKeys2', - Did: '[u8;32]', - Bytes32: { - value: '[u8;32]' - }, - Bytes33: { - value: '[u8;33]' - }, - Bytes64: { - value: '[u8;64]' - }, - Bytes65: { - value: '[u8;65]' - }, - PublicKey: { - _enum: { - Sr25519: 'Bytes32', - Ed25519: 'Bytes32', - Secp256k1: 'Bytes33' - } - }, - DidSignature: { - _enum: { - Sr25519: 'Bytes64', - Ed25519: 'Bytes64', - Secp256k1: 'Bytes65' - } - }, - KeyDetail: { - controller: 'Did', - public_key: 'PublicKey' - }, - KeyUpdate: { - did: 'Did', - public_key: 'PublicKey', - controller: 'Option', - last_modified_in_block: 'BlockNumber' - }, - DidRemoval: { - did: 'Did', - last_modified_in_block: 'BlockNumber' - }, - RegistryId: '[u8;32]', - RevokeId: '[u8;32]', - Registry: { - policy: 'Policy', - add_only: 'bool' - }, - Revoke: { - registry_id: 'RegistryId', - revoke_ids: 'BTreeSet', - last_modified: 'BlockNumber' - }, - UnRevoke: { - registry_id: 'RegistryId', - revoke_ids: 'BTreeSet', - last_modified: 'BlockNumber' - }, - RemoveRegistry: { - registry_id: 'RegistryId', - last_modified: 'BlockNumber' - }, - PAuth: 'BTreeMap', - Policy: { - _enum: { - OneOf: 'BTreeSet' - } - }, - BlobId: '[u8;32]', - Blob: { - id: 'BlobId', - blob: 'Vec', - author: 'Did' - }, - EpochNo: 'u32', - EpochLen: 'u32', - SlotNo: 'u64', - Balance: 'u64', - EpochDetail: { - validator_count: 'u8', - starting_slot: 'SlotNo', - expected_ending_slot: 'SlotNo', - ending_slot: 'Option', - total_emission: 'Option', - emission_for_treasury: 'Option', - emission_for_validators: 'Option' - }, - ValidatorStatsPerEpoch: { - block_count: 'EpochLen', - locked_reward: 'Option', - unlocked_reward: 'Option' - }, - Payload: { - proposal: 'Vec', - round_no: 'u64' - }, - Membership: { - members: 'BTreeSet', - vote_requirement: 'u64' - }, - PMAuth: 'BTreeMap', - Bonus: { - swap_bonuses: 'Vec<(Balance, BlockNumber)>', - vesting_bonuses: 'Vec<(Balance, Balance, BlockNumber)>' - }, - StateChange: { - _enum: { - KeyUpdate: 'KeyUpdate', - DidRemoval: 'DidRemoval', - Revoke: 'Revoke', - UnRevoke: 'UnRevoke', - RemoveRegistry: 'RemoveRegistry', - Blob: 'Blob', - MasterVote: 'Payload' - } - } - } - } - ] -}; - -export default definitions; diff --git a/packages/apps-config/src/api/spec/index.ts b/packages/apps-config/src/api/spec/index.ts index d51e520ff3..525be28d1a 100644 --- a/packages/apps-config/src/api/spec/index.ts +++ b/packages/apps-config/src/api/spec/index.ts @@ -21,7 +21,8 @@ import testPara from './cumulus-test-parachain'; import darwinia from './darwinia'; import darwiniaParachain from './darwinia-parachain'; import datahighwayParachain from './datahighway'; -import dock from './dock'; +import dockPoaMainnet from './dock-poa-mainnet'; +import dockPoaTestnet from './dock-poa-testnet'; import dotmog from './dotmog'; import dusty from './dusty'; import eave from './eave'; @@ -121,8 +122,8 @@ const spec: Record = { 'datahighway-parachain': datahighwayParachain, dawn: eave, 'dev-parachain': zenlink, - 'dock-main-runtime': dock, - 'dock-testnet': dock, + 'dock-main-runtime': dockPoaMainnet, + 'dock-test-runtime': dockPoaTestnet, 'dotmog-node': dotmog, dusty4: dusty, edgeware, diff --git a/packages/apps-config/src/endpoints/testing.ts b/packages/apps-config/src/endpoints/testing.ts index 70bcbee97f..951b6f3296 100644 --- a/packages/apps-config/src/endpoints/testing.ts +++ b/packages/apps-config/src/endpoints/testing.ts @@ -85,7 +85,7 @@ export function createTesting (t: TFunction, firstOnly?: boolean): LinkOption[] }, { info: 'dock-testnet', - isDisabled: true, // Cannot construct unknown type EpochNo + isDisabled: false, text: t('rpc.test.dock-testnet', 'Dock', { ns: 'apps-config' }), providers: { 'Dock Association': 'wss://danforth-1.dock.io' diff --git a/yarn.lock b/yarn.lock index cd89ba4bba..791473fe7c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1516,6 +1516,13 @@ __metadata: languageName: node linkType: hard +"@docknetwork/node-types@npm:^0.4.6": + version: 0.4.6 + resolution: "@docknetwork/node-types@npm:0.4.6" + checksum: 8ed2649a3c11dd3ffb851dc0771a4c7bda673aec4332c86038d96f1c7c25d1a8b21d67b0133f7a15dc189e66b09e62fe4a0c6c0ef080ef8572b9e3a7dfe65217 + languageName: node + linkType: hard + "@edgeware/node-types@npm:^3.5.1-erup-4": version: 3.5.1-erup-4 resolution: "@edgeware/node-types@npm:3.5.1-erup-4" @@ -2538,6 +2545,7 @@ __metadata: "@babel/runtime": ^7.14.0 "@crustio/type-definitions": 0.0.10 "@darwinia/types": ^1.1.0-alpha.21 + "@docknetwork/node-types": ^0.4.6 "@edgeware/node-types": ^3.5.1-erup-4 "@equilab/definitions": 1.1.1 "@interlay/polkabtc-types": ^0.7.3