From ea473a22334c0429627d2e2e984cdeda53c66129 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Wed, 12 Aug 2020 19:58:15 +0200
Subject: [PATCH] Beresheet weight (#3407)

* Beresheet weight type

* Beresheet Weight

* Revert package change

* Update to @edgeware/node-types
---
 package.json                                    |  1 -
 packages/apps-config/package.json               |  2 +-
 packages/apps-config/src/api/chain/beresheet.ts |  6 ++++--
 packages/apps-config/src/api/spec/edgeware.ts   |  2 +-
 yarn.lock                                       | 16 ++++------------
 5 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index e078fb7c88..b3a02ad733 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,6 @@
     "@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/package.json b/packages/apps-config/package.json
index 2febfad2a5..24201e888d 100644
--- a/packages/apps-config/package.json
+++ b/packages/apps-config/package.json
@@ -13,6 +13,6 @@
   "dependencies": {
     "@acala-network/type-definitions": "0.3.1",
     "@babel/runtime": "^7.11.2",
-    "edgeware-node-types": "^2.3.4"
+    "@edgeware/node-types": "^2.3.5"
   }
 }
diff --git a/packages/apps-config/src/api/chain/beresheet.ts b/packages/apps-config/src/api/chain/beresheet.ts
index 4882ece16d..0a12706fa7 100644
--- a/packages/apps-config/src/api/chain/beresheet.ts
+++ b/packages/apps-config/src/api/chain/beresheet.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/dist/interfaces/definitions';
 
 const edgTypes = Object
   .values(edgewareDefinitions)
@@ -16,5 +16,7 @@ export default {
   // aliases that don't do well as part of interfaces
   'voting::VoteType': 'VoteType',
   'voting::TallyType': 'TallyType',
-  'voting::Tally': 'VotingTally'
+  'voting::Tally': 'VotingTally',
+  // Substrate overrides
+  Weight: 'u64'
 };
diff --git a/packages/apps-config/src/api/spec/edgeware.ts b/packages/apps-config/src/api/spec/edgeware.ts
index 1453e50660..a65d729ba8 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/dist/interfaces/definitions';
 
 const edgTypes = Object
   .values(edgewareDefinitions)
diff --git a/yarn.lock b/yarn.lock
index b758d8771a..9af50cf01f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1506,9 +1506,9 @@ __metadata:
   linkType: hard
 
 "@edgeware/node-types@npm:^2.3.5":
-  version: 2.3.5
-  resolution: "@edgeware/node-types@npm:2.3.5"
-  checksum: ee1674a3867b0cbdb1456f5867521e67b308dc41fa2002a3bbd1506f7e4bd83ed5bc57ee9946acc6179cbd1f1f74a2deca798407e5fe3d1dd817b7819e1f8b68
+  version: 2.4.1
+  resolution: "@edgeware/node-types@npm:2.4.1"
+  checksum: e9a3e67a18acb765bcee61308f3934e5efeb904e71db089cedfc8243a4e2ec0ddc592e1941108ad7b05dfb01fe33b9dc7e768e4b0b7086f0106b9aa097a5403f
   languageName: node
   linkType: hard
 
@@ -3296,7 +3296,7 @@ __metadata:
   dependencies:
     "@acala-network/type-definitions": 0.3.1
     "@babel/runtime": ^7.11.2
-    edgeware-node-types: ^2.3.4
+    "@edgeware/node-types": ^2.3.5
   languageName: unknown
   linkType: soft
 
@@ -9650,13 +9650,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"edgeware-node-types@npm:^2.3.4":
-  version: 2.3.4
-  resolution: "edgeware-node-types@npm:2.3.4"
-  checksum: b1c3b0f7ecc8675bdcd19e564b23c3600a4795c220fd6e020ca0515188b3cd7ecaedb1cd0b1f04dd84a7a77316bf04a5cf81639a301c8f5880a95d2a5e259e3d
-  languageName: node
-  linkType: hard
-
 "editions@npm:^2.2.0":
   version: 2.3.1
   resolution: "editions@npm:2.3.1"
@@ -18296,7 +18289,6 @@ __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