opportunity-service 0.0.542 → 0.0.546

package/dist/api/internal/addresses.js

@@ -1,25 +1,22 @@
-import * as addressMap from '../../blockchain/addresses.json';
-export default {
-    "rinkeby": {
-        'MarketFactory': addressMap['rinkeby']['MarketFactory'],
-        'UserRegistration': addressMap['rinkeby']['UserRegistration'],
-        'UserSummaryFactory': addressMap['rinkeby']['UserSummaryFactory'],
-        'Dai': addressMap['rinkeby']['Dai'],
-        'Participation': addressMap['rinkeby']['Participation']
-    },
-    "mainnet": {
-        'MarketFactory': addressMap['mainnet']['MarketFactory'],
-        'UserRegistration': addressMap['mainnet']['UserRegistration'],
-        'UserSummaryFactory': addressMap['mainnet']['UserSummaryFactory'],
-        'Dai': addressMap['mainnet']['Dai'],
-        'Participation': addressMap['mainnet']['Participation']
-    },
-    "xdai": {
-        'MarketFactory': addressMap['xdai']['MarketFactory'],
-        'UserRegistration': addressMap['xdai']['UserRegistration'],
-        'UserSummaryFactory': addressMap['xdai']['UserSummaryFactory'],
-        'Dai': addressMap['xdai']['Dai'],
-        'Participation': addressMap['xdai']['Participation']
-    }
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
 };
+import opportunityService from '../../OpportunityService';
+import * as addressMap from '../../blockchain/addresses.json';
+function getAddressMap() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const network = (yield (opportunityService === null || opportunityService === void 0 ? void 0 : opportunityService.getEthNetwork())) || 'rinkeby';
+        console.log('@@@@');
+        console.log(network);
+        console.log(JSON.parse(addressMap[network]));
+        return JSON.parse(addressMap[network]);
+    });
+}
+export default getAddressMap();
 //# sourceMappingURL=addresses.js.map

package/dist/api/internal/addresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAE9D,eAAe;IACX,SAAS,EAAE;QACP,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC;QACvD,kBAAkB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,kBAAkB,CAAC;QAC7D,oBAAoB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC;QACjE,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;QACnC,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC;KAC1D;IACD,SAAS,EAAE;QACP,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC;QACvD,kBAAkB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,kBAAkB,CAAC;QAC7D,oBAAoB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC;QACjE,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;QACnC,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC;KAC1D;IACD,MAAM,EAAE;QACJ,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC;QACpD,kBAAkB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC;QAC1D,oBAAoB,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC;QAC9D,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC;QAChC,eAAe,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC;KACvD;CACJ,CAAA"}
+{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAG9D,SAAe,aAAa;;QACxB,MAAM,OAAO,GAAG,CAAA,MAAM,CAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,aAAa,EAAE,CAAA,KAAI,SAAS,CAAA;QACtE,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;QACnB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QACpB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;QAC5C,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAC1C,CAAC;CAAA;AAED,eAAe,aAAa,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opportunity-service",
-  "version": "0.0.542",
+  "version": "0.0.546",
   "description": "A service layer that connects all services between the blockchain and ui.",
   "main": "index.js",
   "scripts": {

package/src/api/internal/addresses.ts

@@ -1,26 +1,13 @@
 import opportunityService from '../../OpportunityService';
 import * as addressMap from '../../blockchain/addresses.json';
+import { EthNetworkID } from 'dvote-js';
 
-export default {
-    "rinkeby": {
-        'MarketFactory': addressMap['rinkeby']['MarketFactory'],
-        'UserRegistration': addressMap['rinkeby']['UserRegistration'],
-        'UserSummaryFactory': addressMap['rinkeby']['UserSummaryFactory'],
-        'Dai': addressMap['rinkeby']['Dai'],
-        'Participation': addressMap['rinkeby']['Participation']
-    },
-    "mainnet": {
-        'MarketFactory': addressMap['mainnet']['MarketFactory'],
-        'UserRegistration': addressMap['mainnet']['UserRegistration'],
-        'UserSummaryFactory': addressMap['mainnet']['UserSummaryFactory'],
-        'Dai': addressMap['mainnet']['Dai'],
-        'Participation': addressMap['mainnet']['Participation']
-    },
-    "xdai": {
-        'MarketFactory': addressMap['xdai']['MarketFactory'],
-        'UserRegistration': addressMap['xdai']['UserRegistration'],
-        'UserSummaryFactory': addressMap['xdai']['UserSummaryFactory'],
-        'Dai': addressMap['xdai']['Dai'],
-        'Participation': addressMap['xdai']['Participation']
-    }
-}
+async function getAddressMap() {
+    const network = await opportunityService?.getEthNetwork() || 'rinkeby'
+    console.log('@@@@')
+    console.log(network)
+    console.log(JSON.parse(addressMap[network]))
+    return JSON.parse(addressMap[network])
+}
+
+export default getAddressMap()