Swap Edgeware to specVersioned (#4353)

packages/apps-config/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@acala-network/type-definitions": "^0.6.1",
     "@babel/runtime": "^7.12.5",
-    "@edgeware/node-types": "^3.0.11",
+    "@edgeware/node-types": "^3.2.0",
     "@interlay/polkabtc-types": "^0.2.9",
     "@laminar/type-definitions": "^0.2.0-beta.141",
     "@polkadot/networks": "^5.2.3",

packages/apps-config/src/api/chain/beresheet.ts

@@ -1,13 +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 */
-
-import { Beresheet } from '@edgeware/node-types';
-
-export default {
-  ...Beresheet.types,
-  // Substrate overrides
-  RefCount: 'u32'
-};

packages/apps-config/src/api/chain/index.ts

@@ -1,11 +1,9 @@
 // Copyright 2017-2021 @polkadot/apps-config authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Beresheet from './beresheet';
 import Phala from './phala';
 
 // alphabetical, based on the actual displayed name
 export default {
-  Beresheet,
   'Phala PoC-3': Phala
 };

packages/apps-config/src/api/index.ts

@@ -10,8 +10,8 @@ export * from './params';
 
 export function getChainTypes (specName: string, chainName: string): Record<string, string | Record<string, unknown>> {
   return {
-    ...(typesSpec[specName as 'edgeware'] || {}),
-    ...(typesChain[chainName as 'Beresheet'] || {})
+    ...(typesSpec[specName as keyof typeof typesSpec] || {}),
+    ...(typesChain[chainName as keyof typeof typesChain] || {})
   };
 }
 

packages/apps-config/src/api/spec/edgeware.ts

@@ -1,13 +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 */
-
-import { Beresheet } from '@edgeware/node-types';
-
-export default {
-  ...Beresheet.types,
-  // chain-specific overrides
-  RefCount: 'u32'
-};

packages/apps-config/src/api/spec/index.ts

@@ -11,7 +11,6 @@ import darwinia from './darwinia';
 import darwiniaParachain from './darwinia-parachain';
 import dock from './dock';
 import dusty from './dusty';
-import edgeware from './edgeware';
 import encointerNodeNotee from './encointer-node-notee';
 import encointerNodeTeeproxy from './encointer-node-teeproxy';
 import equilibrium from './equilibrium';
@@ -43,7 +42,6 @@ export default {
   'dock-main-runtime': dock,
   'dock-testnet': dock,
   dusty3: dusty,
-  edgeware,
   'encointer-node': encointerNodeNotee,
   'encointer-node-notee': encointerNodeNotee,
   'encointer-node-teeproxy': encointerNodeTeeproxy,

packages/apps-config/src/api/specVersioned/edgeware.ts

@@ -0,0 +1,10 @@
+// Copyright 2017-2021 @polkadot/apps-config authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { OverrideBundleDefinition } from '@polkadot/types/types';
+
+import { spec } from '@edgeware/node-types';
+
+const edgeware = spec.typesBundle.spec?.edgeware as OverrideBundleDefinition;
+
+export default edgeware;

packages/apps-config/src/api/specVersioned/index.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import acala from './acala';
+import edgeware from './edgeware';
 import equilibrium from './equilibrium';
 import kulupu from './kulupu';
 import laminar from './laminar';
@@ -13,6 +14,7 @@ export default {
   Equilibrium: equilibrium,
   acala,
   'btc-parachain': polkabtc,
+  edgeware,
   kulupu,
   laminar,
   mandala: acala,

yarn.lock

@@ -1391,10 +1391,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@edgeware/node-types@npm:^3.0.11":
-  version: 3.0.11
-  resolution: "@edgeware/node-types@npm:3.0.11"
-  checksum: a98552a63dd138748c5c68ee34401e2b46b326cd5897eb001d74b1ebb4a0817a074be60cde10fd1ee0368f5923554c56476fedc96cffe3764bdc87675a7e4790
+"@edgeware/node-types@npm:^3.2.0":
+  version: 3.2.0
+  resolution: "@edgeware/node-types@npm:3.2.0"
+  checksum: a5c0ff07269fd67f0d3c468426fecf00d66ba651cc77f285082945b5c894f47d50ab10488614ec0a6cf633143e7987ca1061a52657770f10cb8401e94ebb7215
   languageName: node
   linkType: hard
 
@@ -2185,7 +2185,7 @@ __metadata:
   dependencies:
     "@acala-network/type-definitions": ^0.6.1
     "@babel/runtime": ^7.12.5
-    "@edgeware/node-types": ^3.0.11
+    "@edgeware/node-types": ^3.2.0
     "@interlay/polkabtc-types": ^0.2.9
     "@laminar/type-definitions": ^0.2.0-beta.141
     "@polkadot/networks": ^5.2.3