From 32236d0cdbddd961cb19d43aab4679800acbb756 Mon Sep 17 00:00:00 2001
From: Jakub Sydor <sydorjakub@gmail.com>
Date: Mon, 14 Feb 2022 09:05:40 +0100
Subject: [PATCH] feat: get EWC chain config from `iam-contracts`

---
 package-lock.json          | 18 +++++++++---------
 package.json               |  2 +-
 src/config/chain.config.ts | 18 ++++++++----------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 71d178a8..c291bbed 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,18 +1,18 @@
 {
   "name": "iam-client-lib",
-  "version": "4.1.0-alpha.12",
+  "version": "4.1.0-alpha.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "iam-client-lib",
-      "version": "4.1.0-alpha.12",
+      "version": "4.1.0-alpha.13",
       "license": "GPL-3.0-or-later",
       "dependencies": {
         "@babel/plugin-transform-runtime": "^7.15.8",
         "@babel/runtime": "^7.12.5",
         "@energyweb/ekc": "^0.6.5",
-        "@energyweb/iam-contracts": "^4.1.0",
+        "@energyweb/iam-contracts": "^4.2.1",
         "@energyweb/staking-pool": "^1.0.0-rc.14",
         "@ensdomains/ens": "^0.6.2",
         "@ethersproject/abstract-provider": "5.4.1",
@@ -2086,9 +2086,9 @@
       }
     },
     "node_modules/@energyweb/iam-contracts": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@energyweb/iam-contracts/-/iam-contracts-4.1.0.tgz",
-      "integrity": "sha512-fj3a4DXJzJsnFd3hiInN9KHvzK5nnErY3JMI5phOyEva57w+J2VE2Z62Q96gweECHnLlGH0/BsPcTA5z+TW8Cg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@energyweb/iam-contracts/-/iam-contracts-4.2.1.tgz",
+      "integrity": "sha512-dW+1XxwOCD/VLcUhNMSqwp7ZlBLmbtujqQKU0Rcvb3sbLlJohz3NpZndrF3pnZa7fOozouiA3bPnmqm1R5Bhbw==",
       "dependencies": {
         "ethers": "5.4.7"
       }
@@ -28616,9 +28616,9 @@
       "requires": {}
     },
     "@energyweb/iam-contracts": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@energyweb/iam-contracts/-/iam-contracts-4.1.0.tgz",
-      "integrity": "sha512-fj3a4DXJzJsnFd3hiInN9KHvzK5nnErY3JMI5phOyEva57w+J2VE2Z62Q96gweECHnLlGH0/BsPcTA5z+TW8Cg==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@energyweb/iam-contracts/-/iam-contracts-4.2.1.tgz",
+      "integrity": "sha512-dW+1XxwOCD/VLcUhNMSqwp7ZlBLmbtujqQKU0Rcvb3sbLlJohz3NpZndrF3pnZa7fOozouiA3bPnmqm1R5Bhbw==",
       "requires": {
         "ethers": "5.4.7"
       }
diff --git a/package.json b/package.json
index 721469dd..8c0a9dc1 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "@babel/plugin-transform-runtime": "^7.15.8",
     "@babel/runtime": "^7.12.5",
     "@energyweb/ekc": "^0.6.5",
-    "@energyweb/iam-contracts": "^4.1.0",
+    "@energyweb/iam-contracts": "^4.2.1",
     "@energyweb/staking-pool": "^1.0.0-rc.14",
     "@ensdomains/ens": "^0.6.2",
     "@ethersproject/abstract-provider": "5.4.1",
diff --git a/src/config/chain.config.ts b/src/config/chain.config.ts
index 3ad10c82..dc720d81 100644
--- a/src/config/chain.config.ts
+++ b/src/config/chain.config.ts
@@ -8,6 +8,13 @@ import {
   VOLTA_IDENTITY_MANAGER_ADDRESS,
   VOLTA_CLAIM_MANAGER_ADDRESS,
   EWC_CHAIN_ID,
+  EWC_ADDRESS_1056,
+  EWC_CLAIM_MANAGER_ADDRESS,
+  EWC_DOMAIN_NOTIFER_ADDRESS,
+  EWC_ENS_REGISTRY_ADDRESS,
+  EWC_IDENTITY_MANAGER_ADDRESS,
+  EWC_PUBLIC_RESOLVER_ADDRESS,
+  EWC_RESOLVER_V1_ADDRESS,
 } from '@energyweb/iam-contracts';
 import { VOLTA_CHAIN_ID } from '../utils/constants';
 
@@ -28,15 +35,6 @@ export interface ChainConfig {
 
 export type ChainId = number;
 
-// TODO: Would be better if some of these were in @energyweb/iam-contracts
-const EWC_CLAIM_MANAGER_ADDRESS = '0x23b026631A6f265d17CFee8aa6ced1B244f3920C';
-const EWC_ENS_REGISTRY_ADDRESS = '0x0A6d64413c07E10E890220BBE1c49170080C6Ca0';
-const EWC_RESOLVER_V1_ADDRESS = '0x70ad37DfeB1C05290F4bBd22188FA19Bc154A0ea';
-const EWC_PUBLIC_RESOLVER_ADDRESS = '0xA517983Bd4Af4DF0Ed9b52DA4BC405d0A95eE7E2';
-const EWC_DOMAIN_NOTIFER_ADDRESS = '0x5491Db3cC1f3AFf6C229e061735F92936004da3c';
-const EWC_IDENTITY_MANAGER_ADDRESS = '0x2d1569f3a2006d21c0dc60eb13c8557b63ce5a8d';
-const EwcAddress1056 = '0xE29672f34e92b56C9169f9D485fFc8b9A136BCE4';
-
 /**
  * Set of parameters to configure connection to chain with id received from wallet.
  * If configuration for some chain is missing or should be reconfigured use `setChainConfig` before class instantiation
@@ -64,7 +62,7 @@ const chainConfig: Record<number, ChainConfig> = {
     ensPublicResolverAddress: EWC_PUBLIC_RESOLVER_ADDRESS,
     domainNotifierAddress: EWC_DOMAIN_NOTIFER_ADDRESS,
     assetManagerAddress: EWC_IDENTITY_MANAGER_ADDRESS,
-    didRegistryAddress: EwcAddress1056,
+    didRegistryAddress: EWC_ADDRESS_1056,
     claimManagerAddress: EWC_CLAIM_MANAGER_ADDRESS,
     stakingPoolFactoryAddress: '', // This is not deployed on EWC
   },