From a4333c22c4914ef67f9e5c164bc93ce4d6c348d3 Mon Sep 17 00:00:00 2001
From: Drew Stone <drewstone329@gmail.com>
Date: Wed, 6 May 2020 00:06:49 -0600
Subject: [PATCH] Updates Edgeware network types (#2690)

* Update extra key

* Update edgeware types
---
 packages/apps-config/package.json             |  2 +-
 packages/apps-config/src/api/chain/berlin.ts  | 20 +++++++++++++++----
 packages/apps-config/src/api/spec/edgeware.ts | 20 +++++++++++--------
 yarn.lock                                     |  4 ++--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json
index 4ae29f800a..d4c27eae7b 100644
--- a/packages/apps-config/package.json
+++ b/packages/apps-config/package.json
@@ -12,6 +12,6 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@babel/runtime": "^7.9.6",
-    "edgeware-node-types": "^2.0.1"
+    "edgeware-node-types": "^2.1.0"
   }
 }
diff --git a/packages/apps-config/src/api/chain/berlin.ts b/packages/apps-config/src/api/chain/berlin.ts
index 76ecdf777c..d14a6fd1f7 100644
--- a/packages/apps-config/src/api/chain/berlin.ts
+++ b/packages/apps-config/src/api/chain/berlin.ts
@@ -2,10 +2,22 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+import * as edgewareDefinitions from 'edgeware-node-types/dist/definitions';
+
+const edgTypes = Object.values(edgewareDefinitions)
+  .reduce((res, { default: { types } }): object => ({ ...res, ...types }), {});
+
 export default {
-  // previous substrate versions
-  BalanceLock: 'BalanceLockTo212',
-  ReferendumInfo: 'ReferendumInfoTo239',
+  ...edgTypes,
+  // 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',
-  Weight: 'u32'
+  Votes: 'VotesTo230',
+  ReferendumInfo: 'ReferendumInfoTo239',
+  Weight: 'u32',
 };
diff --git a/packages/apps-config/src/api/spec/edgeware.ts b/packages/apps-config/src/api/spec/edgeware.ts
index 667fae1223..d14a6fd1f7 100644
--- a/packages/apps-config/src/api/spec/edgeware.ts
+++ b/packages/apps-config/src/api/spec/edgeware.ts
@@ -2,18 +2,22 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import signaling from 'edgeware-node-types/dist/signaling/definitions';
-import treasuryRewards from 'edgeware-node-types/dist/treasuryRewards/definitions';
-import voting from 'edgeware-node-types/dist//voting/definitions';
+import * as edgewareDefinitions from 'edgeware-node-types/dist/definitions';
 
-import { typesFromDefs } from '../util';
+const edgTypes = Object.values(edgewareDefinitions)
+  .reduce((res, { default: { types } }): object => ({ ...res, ...types }), {});
 
 export default {
-  ...typesFromDefs({ signaling, treasuryRewards, voting }),
+  ...edgTypes,
+  // 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',
-  // previous substrate versions
-  ReferendumInfo: 'ReferendumInfoTo239',
   StakingLedger: 'StakingLedgerTo223',
-  Weight: 'u32'
+  Votes: 'VotesTo230',
+  ReferendumInfo: 'ReferendumInfoTo239',
+  Weight: 'u32',
 };
diff --git a/yarn.lock b/yarn.lock
index d1fa773f85..57aac2d194 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3117,7 +3117,7 @@ __metadata:
   resolution: "@polkadot/apps-config@workspace:packages/apps-config"
   dependencies:
     "@babel/runtime": ^7.9.6
-    edgeware-node-types: ^2.0.1
+    edgeware-node-types: ^2.1.0
   languageName: unknown
   linkType: soft
 
@@ -8680,7 +8680,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"edgeware-node-types@npm:^2.0.1":
+"edgeware-node-types@npm:^2.1.0":
   version: 2.1.0
   resolution: "edgeware-node-types@npm:2.1.0"
   checksum: 2/ef0809ae1a0bfb5e7f510202e8be7ebaef444b7d388b1238b1d642241bcadfa2ed67a5567e745b4c887f3dc106a51ebacb6c511433a1303fbd9cc022df8e16ab