opportunity-service 0.0.521 → 0.0.525

package/dist/OpportunityService.js

@@ -30,9 +30,9 @@ class OpportunityService {
         this.opportunityLogger = null;
         this.storageProvider = opportunityStorageProvider;
         this.currentAccount = null;
-        this.ethNetwork = 'rinkeby';
+        this.ethNetwork = 'mainnet';
         this.api = opportunityAPI;
-        this.ethNetwork = 'rinkeby';
+        this.ethNetwork = 'mainnet';
     }
     /**
      * The static method that controls the access to the singleton instance.
@@ -67,10 +67,10 @@ class OpportunityService {
                 this.ethNetwork = 'mainnet';
                 break;
             case 4:
-                this.ethNetwork = 'rinkeby';
+                this.ethNetwork = 'mainnet';
                 break;
             default:
-                this.ethNetwork = 'rinkeby';
+                this.ethNetwork = 'mainnet';
         }
     }
     getEthNetwork() {

package/dist/api/exchange/create-dispute.js

@@ -28,7 +28,7 @@ function createDispute(data) {
             // The factory we use for deploying contracts
             const disputeContractfactory = new ContractFactory(abi, bytecodeMap[Contracts.DISPUTE], opportunityService.getSignersInterface());
             // Deploy an instance of the contract
-            const disputeContract = yield disputeContractfactory.deploy(relationshipAddress, addressMap['rinkeby'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
+            const disputeContract = yield disputeContractfactory.deploy(relationshipAddress, addressMap['mainnet'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
             const txReceipt = yield disputeContract.deployTransaction.wait();
             console.log(txReceipt);
         }

package/dist/api/exchange/create-task.js

@@ -38,7 +38,7 @@ function createTask(data) {
             console.log('d');
             const contract = yield new ethers.Contract(taskMarket, abi).connect(opportunityService.getSignersInterface());
             console.log('e');
-            const txResponse = yield contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['rinkeby']['Dai']);
+            const txResponse = yield contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['mainnet']['Dai']);
             const txReceipt = yield txResponse.wait();
             console.log(txReceipt);
         }

package/dist/api/identity/register-new-user.js

@@ -14,7 +14,7 @@ import * as addressMap from '../../blockchain/addresses.json';
 import * as abiMap from '../../blockchain/abi.json';
 function registerNewUser(universalAddress) {
     return __awaiter(this, void 0, void 0, function* () {
-        const txResult = new Contract(addressMap['rinkeby'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
+        const txResult = new Contract(addressMap['mainnet'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
             .connect(opportunityService.getSignersInterface())
             .functions
             .registerNewUser(universalAddress)

package/dist/api/internal/addresses.js

@@ -1,9 +1,19 @@
-import * as addressMap from '../../blockchain/addresses.json';
-const ethNetwork = 'rinkeby'; //'rinkeby'
+import * as addresses from '../../blockchain/addresses.json';
+const ethNetwork = 'mainnet'; //'mainnet'
+const addressMapToString = JSON.stringify(addresses);
+const addressMap = JSON.parse(addressMapToString);
+const dig = (obj, target) => target in obj ?
+    obj[target] :
+    Object.values(obj).reduce((acc, val) => {
+        if (acc !== undefined)
+            return acc;
+        if (typeof val === 'object')
+            return dig(val, target);
+    }, undefined);
 export default {
-    'MarketFactory': addressMap['rinkeby']['MarketFactory'],
-    'UserRegistration': addressMap['rinkeby']['UserRegistration'],
-    'Dai': addressMap['rinkeby']['Dai'],
-    'Scheduler': addressMap['rinkeby']['Scheduler']
+    'MarketFactory': dig(addressMap, 'MarketFactory'),
+    'UserRegistration': dig(addressMap, 'UserRegistration'),
+    'Dai': dig(addressMap, 'Dai'),
+    'Scheduler': dig(addressMap, 'Scheduler')
 };
 //# 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,MAAM,UAAU,GAAG,SAAS,CAAA,CAAC,WAAW;AAExC,eAAe;IACX,eAAe,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,eAAe,CAAC;IACvD,kBAAkB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,kBAAkB,CAAC;IAC7D,KAAK,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC;IACnC,WAAW,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC;CAClD,CAAA"}
+{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,iCAAiC,CAAC;AAE7D,MAAM,UAAU,GAAG,SAAS,CAAA,CAAC,WAAW;AACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;AAEjD,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CACzB,MAAM,IAAI,GAAG,CAAC,CAAC;IACf,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACpC,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QAClC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC,EAAE,SAAS,CAAC,CAAC;AAGjB,eAAe;IACX,eAAe,EAAE,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC;IACjD,kBAAkB,EAAE,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACvD,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC;CAC5C,CAAA"}

package/dist/blockchain/addresses.json

@@ -1,13 +1,15 @@
 {
     "rinkeby": {
-        "MarketFactory": "0xc4d293b967C86DC0fC0Fd41850223464431a40de",
-        "UserRegistration": "0xA81d698B0F165E4833239a75300a2cA0DCC8F72d",
+        "MarketFactory": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
+        "UserRegistration": "0x520d8C14A349E0fB2aec3726880595A0a780b5BD",
+        "UserSummaryFactory": "0xA81d698B0F165E4833239a75300a2cA0DCC8F72d",
         "Dai": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
         "Scheduler": "0x"
     },
     "mainnet": {
         "MarketFactory": "0x8eb065482F681537e90eab826540E9DF8D8cBd89",
         "UserRegistration": "0xc4F1B570e57A5035a25035AFA5f7CbA204627024",
+        "UserSummaryFactory": "",
         "Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
         "Scheduler": "0x"
     }

package/dist/sync/sync-markets.js

@@ -15,7 +15,7 @@ function syncMarkets() {
     return __awaiter(this, void 0, void 0, function* () {
         //sync Markets
         yield opportunityService.getProviderInterface().getLogs({
-            address: addressMap['rinkeby'][Contracts.MARKET_FACTORY],
+            address: addressMap['mainnet'][Contracts.MARKET_FACTORY],
             fromBlock: 1,
             toBlock: 'latest'
         }).then((logs) => {

package/package.json

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

package/src/OpportunityService.ts

@@ -23,7 +23,7 @@ class OpportunityService {
     private opportunityLogger = null;
     private storageProvider = opportunityStorageProvider;
     private currentAccount = null;
-    private ethNetwork : string = 'rinkeby'
+    private ethNetwork : string = 'mainnet'
     public api  = opportunityAPI;
 
     private static instance: OpportunityService;
@@ -33,7 +33,7 @@ class OpportunityService {
      * construction calls with the `new` operator.
      */
     private constructor() {
-        this.ethNetwork = 'rinkeby'
+        this.ethNetwork = 'mainnet'
     }
 
     /**
@@ -76,10 +76,10 @@ class OpportunityService {
                 this.ethNetwork = 'mainnet'
                 break
             case 4:
-                this.ethNetwork = 'rinkeby'
+                this.ethNetwork = 'mainnet'
                 break
             default:
-                this.ethNetwork = 'rinkeby'
+                this.ethNetwork = 'mainnet'
         }
     }
 

package/src/api/exchange/create-dispute.ts

@@ -31,7 +31,7 @@ async function createDispute(data) : Promise<void> {
         const disputeContractfactory = new ContractFactory(abi, bytecodeMap[Contracts.DISPUTE], opportunityService.getSignersInterface())
 
         // Deploy an instance of the contract
-        const disputeContract = await disputeContractfactory.deploy(relationshipAddress, addressMap['rinkeby'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
+        const disputeContract = await disputeContractfactory.deploy(relationshipAddress, addressMap['mainnet'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
         const txReceipt = await disputeContract.deployTransaction.wait()
         console.log(txReceipt)
     } catch(error) {

package/src/api/exchange/create-task.ts

@@ -40,7 +40,7 @@ async function createTask(data) : Promise<void> {
         console.log('d')
     const contract = await new ethers.Contract(taskMarket, abi).connect(opportunityService.getSignersInterface());
     console.log('e')
-    const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['rinkeby']['Dai'])
+    const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['mainnet']['Dai'])
     const txReceipt = await txResponse.wait()
     console.log(txReceipt)
     } catch(error) {

package/src/api/identity/register-new-user.ts

@@ -7,7 +7,7 @@ import * as abiMap from '../../blockchain/abi.json';
 import { Result } from 'ethers/lib/utils';
 
 async function registerNewUser(universalAddress) {
-const txResult = new Contract(addressMap['rinkeby'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
+const txResult = new Contract(addressMap['mainnet'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
 .connect(opportunityService.getSignersInterface())
 .functions
 .registerNewUser(universalAddress)

package/src/api/internal/addresses.ts

@@ -1,11 +1,22 @@
 import opportunityService from '../../OpportunityService';
-import * as addressMap from '../../blockchain/addresses.json';
+import * as addresses from '../../blockchain/addresses.json';
+
+const ethNetwork = 'mainnet' //'mainnet'
+const addressMapToString = JSON.stringify(addresses)
+const addressMap = JSON.parse(addressMapToString)
+
+const dig = (obj, target) =>
+   target in obj ?
+   obj[target] :
+   Object.values(obj).reduce((acc, val) => {
+      if (acc !== undefined) return acc;
+      if (typeof val === 'object') return dig(val, target);
+   }, undefined);
 
-const ethNetwork = 'rinkeby' //'rinkeby'
 
 export default {
-    'MarketFactory': addressMap['rinkeby']['MarketFactory'],
-    'UserRegistration': addressMap['rinkeby']['UserRegistration'],
-    'Dai': addressMap['rinkeby']['Dai'],
-    'Scheduler': addressMap['rinkeby']['Scheduler']
+    'MarketFactory': dig(addressMap, 'MarketFactory'),
+    'UserRegistration': dig(addressMap, 'UserRegistration'),
+    'Dai': dig(addressMap, 'Dai'),
+    'Scheduler': dig(addressMap, 'Scheduler')
 }

package/src/blockchain/addresses.json

@@ -1,13 +1,15 @@
 {
     "rinkeby": {
-        "MarketFactory": "0xc4d293b967C86DC0fC0Fd41850223464431a40de",
-        "UserRegistration": "0xA81d698B0F165E4833239a75300a2cA0DCC8F72d",
+        "MarketFactory": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
+        "UserRegistration": "0x520d8C14A349E0fB2aec3726880595A0a780b5BD",
+        "UserSummaryFactory": "0xA81d698B0F165E4833239a75300a2cA0DCC8F72d",
         "Dai": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
         "Scheduler": "0x"
     },
     "mainnet": {
         "MarketFactory": "0x8eb065482F681537e90eab826540E9DF8D8cBd89",
         "UserRegistration": "0xc4F1B570e57A5035a25035AFA5f7CbA204627024",
+        "UserSummaryFactory": "",
         "Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
         "Scheduler": "0x"
     }

package/src/sync/sync-markets.ts

@@ -6,7 +6,7 @@ import { processLog } from './process/process-log';
 async function syncMarkets() {
      //sync Markets
      await opportunityService.getProviderInterface().getLogs({ 
-        address: addressMap['rinkeby'][Contracts.MARKET_FACTORY], 
+        address: addressMap['mainnet'][Contracts.MARKET_FACTORY], 
         fromBlock: 1, 
         toBlock: 'latest' 
     }).then((logs) => {

package/test/voting.test.ts

@@ -4,7 +4,7 @@ import { ethers } from "dvote-js/node_modules/ethers"
 import gwPool, { connectGateways } from "../src/api/voting/connect"
 import { registerEntity } from '../src/api/voting/entity'
 
-const ethNetworkId = 'rinkeby'
+const ethNetworkId = 'mainnet'
 const environment = 'dev'
 const bootnodesContentUri = "https://bootnodes.vocdoni.net/gateways.dev.json"