diff --git a/package.json b/package.json index d0d4d67bef..d4e322b672 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,7 @@ "@babel/core": "^7.11.1", "@babel/register": "^7.10.5", "@babel/runtime": "^7.11.2", + "@edgeware/node-types": "^2.3.5", "@pinata/sdk": "^1.1.10", "@polkadot/dev": "^0.55.37", "@polkadot/ts": "^0.3.37", diff --git a/packages/apps-config/src/api/chain/berlin.ts b/packages/apps-config/src/api/chain/beresheet.ts similarity index 72% rename from packages/apps-config/src/api/chain/berlin.ts rename to packages/apps-config/src/api/chain/beresheet.ts index 1c65366471..4882ece16d 100644 --- a/packages/apps-config/src/api/chain/berlin.ts +++ b/packages/apps-config/src/api/chain/beresheet.ts @@ -16,12 +16,5 @@ export default { // aliases that don't do well as part of interfaces 'voting::VoteType': 'VoteType', 'voting::TallyType': 'TallyType', - 'voting::Tally': 'VotingTally', - // chain-specific overrides - Address: 'GenericAddress', - Keys: 'SessionKeys4', - StakingLedger: 'StakingLedgerTo223', - Votes: 'VotesTo230', - ReferendumInfo: 'ReferendumInfoTo239', - Weight: 'u32' + 'voting::Tally': 'VotingTally' }; diff --git a/packages/apps-config/src/api/chain/index.ts b/packages/apps-config/src/api/chain/index.ts index 95d5455f06..3d1b4d8141 100644 --- a/packages/apps-config/src/api/chain/index.ts +++ b/packages/apps-config/src/api/chain/index.ts @@ -3,9 +3,9 @@ // of the Apache-2.0 license. See the LICENSE file for details. import Arcadia from './arcadia'; -import Berlin from './berlin'; +import Beresheet from './beresheet'; export default { 'Arcadia Nodle Network': Arcadia, - Berlin + Beresheet }; diff --git a/packages/apps-config/src/api/index.ts b/packages/apps-config/src/api/index.ts index e70c807a35..fac54eb910 100644 --- a/packages/apps-config/src/api/index.ts +++ b/packages/apps-config/src/api/index.ts @@ -8,7 +8,7 @@ import typesSpec from './spec'; export function getChainTypes (specName: string, chainName: string): Record> { return { ...(typesSpec[specName as 'edgeware'] || {}), - ...(typesChain[chainName as 'Berlin'] || {}) + ...(typesChain[chainName as 'Beresheet'] || {}) }; } diff --git a/packages/apps-config/src/api/spec/edgeware.ts b/packages/apps-config/src/api/spec/edgeware.ts index 1c65366471..1453e50660 100644 --- a/packages/apps-config/src/api/spec/edgeware.ts +++ b/packages/apps-config/src/api/spec/edgeware.ts @@ -5,7 +5,7 @@ // structs need to be in order /* eslint-disable sort-keys */ -import * as edgewareDefinitions from 'edgeware-node-types/interfaces/definitions'; +import * as edgewareDefinitions from '@edgeware/node-types/interfaces/definitions'; const edgTypes = Object .values(edgewareDefinitions) @@ -13,7 +13,6 @@ const edgTypes = Object export default { ...edgTypes, - // aliases that don't do well as part of interfaces 'voting::VoteType': 'VoteType', 'voting::TallyType': 'TallyType', 'voting::Tally': 'VotingTally', diff --git a/packages/apps-config/src/settings/endpoints.ts b/packages/apps-config/src/settings/endpoints.ts index b9086e88b4..c45c4e91ff 100644 --- a/packages/apps-config/src/settings/endpoints.ts +++ b/packages/apps-config/src/settings/endpoints.ts @@ -130,8 +130,8 @@ function createTest (t: TFunction): LinkOption[] { }, { info: 'edgeware', - text: t('rpc.berlin', 'Berlin (Edgeware Testnet, hosted by Commonwealth Labs)', { ns: 'apps-config' }), - value: 'wss://berlin1.edgewa.re' + text: t('rpc.beresheet', 'Beresheet (Edgeware Testnet, hosted by Commonwealth Labs)', { ns: 'apps-config' }), + value: 'wss://beresheet1.edgewa.re' }, { info: 'substrate', diff --git a/packages/apps/public/locales/en/apps-config.json b/packages/apps/public/locales/en/apps-config.json index 533dda51c1..055e94b4ce 100644 --- a/packages/apps/public/locales/en/apps-config.json +++ b/packages/apps/public/locales/en/apps-config.json @@ -1,7 +1,7 @@ { "lng.detect": "Default browser language (auto-detect)", "rpc.arcadia": "Arcadia (Nodle Testnet, hosted by Nodle)", - "rpc.berlin": "Berlin (Edgeware Testnet, hosted by Commonwealth Labs)", + "rpc.beresheet": "Beresheet (Edgeware Testnet, hosted by Commonwealth Labs)", "rpc.custom": "Custom environment", "rpc.edgeware": "Edgeware (Edgeware Mainnet, hosted by Commonwealth Labs)", "rpc.flamingfir": "Flaming Fir (Substrate Testnet, hosted by Parity)", diff --git a/packages/apps/public/locales/es/translation.json b/packages/apps/public/locales/es/translation.json index 9e19dd33f3..4c1b522ba7 100644 --- a/packages/apps/public/locales/es/translation.json +++ b/packages/apps/public/locales/es/translation.json @@ -954,7 +954,7 @@ "role": "rol", "rotation": "rotación", "rpc.arcadia": "Arcadia (Testnet Nodle, ofrecido por Nodle)", - "rpc.berlin": "Berlin (Testnet Edgeware, ofrecido por Commonwealth Labs)", + "rpc.beresheet": "Beresheet (Testnet Edgeware, ofrecido por Commonwealth Labs)", "rpc.custom": "Entorno personalizado", "rpc.edgeware": "Edgeware (red principal Edgeware, ofrecido por Commonwealth Labs)", "rpc.flamingfir": "Flaming Fir (Testnet Substrate, ofrecido por Parity)", diff --git a/packages/apps/public/locales/ja/translation.json b/packages/apps/public/locales/ja/translation.json index a91fcbbb7e..4d467afde0 100644 --- a/packages/apps/public/locales/ja/translation.json +++ b/packages/apps/public/locales/ja/translation.json @@ -493,7 +493,7 @@ "riot": "riot", "riot name": "riot名", "rpc.arcadia": "Arcadia (Nodle Testnet, hosted by Nodle)", - "rpc.berlin": "Berlin (Edgeware Testnet, hosted by Commonwealth Labs)", + "rpc.beresheet": "Beresheet (Edgeware Testnet, hosted by Commonwealth Labs)", "rpc.custom": "カスタムエンドポイント", "rpc.edgeware": "Edgeware (Edgeware Mainnet, hosted by Commonwealth Labs)", "rpc.flamingfir": "Flaming Fir (Substrate Testnet, hosted by Parity)", diff --git a/packages/apps/public/locales/pt/translation.json b/packages/apps/public/locales/pt/translation.json index c8fd8e9592..63266f416d 100644 --- a/packages/apps/public/locales/pt/translation.json +++ b/packages/apps/public/locales/pt/translation.json @@ -959,7 +959,7 @@ "role": "Função", "rotation": "rotação", "rpc.arcadia": "Arcadia (Nodle Testnet, hospedado por Nodle)", - "rpc.berlin": "Berlin (Edgeware Testnet, hospedado pelo Commonwealth Labs)", + "rpc.beresheet": "Beresheet (Edgeware Testnet, hospedado pelo Commonwealth Labs)", "rpc.custom": "Ambiente personalizado", "rpc.edgeware": "Edgeware (Edgeware Mainnet, hospedado pelo Commonwealth Labs)", "rpc.flamingfir": "Fir flamejante (Substrate Testnet, hospedado pela Parity)", diff --git a/packages/apps/public/locales/ru/translation.json b/packages/apps/public/locales/ru/translation.json index fc17e6e1d7..e1ef12c1f0 100644 --- a/packages/apps/public/locales/ru/translation.json +++ b/packages/apps/public/locales/ru/translation.json @@ -972,7 +972,7 @@ "role": "роль", "rotation": "ротация", "rpc.arcadia": "Arcadia (Nodle Testnet, hosted by Nodle)", - "rpc.berlin": "Berlin (Edgeware Testnet, hosted by Commonwealth Labs)", + "rpc.beresheet": "Beresheet (Edgeware Testnet, hosted by Commonwealth Labs)", "rpc.custom": "Пользовательская среда", "rpc.edgeware": "Edgeware (Edgeware Mainnet, hosted by Commonwealth Labs)", "rpc.flamingfir": "Flaming Fir (Substrate Testnet, hosted by Parity)", diff --git a/yarn.lock b/yarn.lock index e1dce14844..b4863aef92 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1505,6 +1505,13 @@ __metadata: languageName: node linkType: hard +"@edgeware/node-types@npm:^2.3.5": + version: 2.3.5 + resolution: "@edgeware/node-types@npm:2.3.5" + checksum: 3/ee1674a3867b0cbdb1456f5867521e67b308dc41fa2002a3bbd1506f7e4bd83ed5bc57ee9946acc6179cbd1f1f74a2deca798407e5fe3d1dd817b7819e1f8b68 + languageName: node + linkType: hard + "@electron/get@npm:^1.0.1": version: 1.12.2 resolution: "@electron/get@npm:1.12.2" @@ -18289,6 +18296,7 @@ __metadata: "@babel/core": ^7.11.1 "@babel/register": ^7.10.5 "@babel/runtime": ^7.11.2 + "@edgeware/node-types": ^2.3.5 "@pinata/sdk": ^1.1.10 "@polkadot/dev": ^0.55.37 "@polkadot/ts": ^0.3.37