opportunity-service 0.0.519 → 0.0.523

package/dist/sync/sync-jobs.js

@@ -0,0 +1,33 @@
+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 { processLog } from './process/process-log';
+function syncJobs(marketAddress) {
+    return __awaiter(this, void 0, void 0, function* () {
+        //sync Jobs
+        yield opportunityService.getProviderInterface().getLogs({
+            address: marketAddress,
+            fromBlock: 1,
+            toBlock: 'latest'
+        }).then((logs) => {
+            console.log('Found logs.. Processing sync Jobs');
+            logs.forEach(log => {
+                if (log && Array.isArray(log.topics) && log.topics.length) {
+                    processLog(log); // keccashinside here
+                }
+            });
+        })
+            .catch(err => {
+            console.log('Err on fetching logs from blockchain: ' + err);
+        });
+    });
+}
+export default syncJobs;
+//# sourceMappingURL=sync-jobs.js.map

package/dist/sync/sync-jobs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-jobs.js","sourceRoot":"","sources":["../../src/sync/sync-jobs.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,SAAe,QAAQ,CAAC,aAAa;;QAChC,WAAW;QACX,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;YACrD,OAAO,EAAE,aAAa;YACtB,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,QAAQ;SACpB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;YAChD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvD,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB;iBACzC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,wCAAwC,GAAG,GAAG,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;IACN,CAAC;CAAA;AAED,eAAe,QAAQ,CAAC"}

package/dist/sync/sync-markets.js

@@ -0,0 +1,35 @@
+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';
+import { Contracts } from '../constants';
+import { processLog } from './process/process-log';
+function syncMarkets() {
+    return __awaiter(this, void 0, void 0, function* () {
+        //sync Markets
+        yield opportunityService.getProviderInterface().getLogs({
+            address: addressMap['rinkeby'][Contracts.MARKET_FACTORY],
+            fromBlock: 1,
+            toBlock: 'latest'
+        }).then((logs) => {
+            console.log('Found logs.. Processing...');
+            logs.forEach(log => {
+                if (log && Array.isArray(log.topics) && log.topics.length) {
+                    processLog(log); // keccashinside here
+                }
+            });
+        })
+            .catch(err => {
+            console.log('Err on fetching logs from blockchain: ' + err);
+        });
+    });
+}
+export default syncMarkets;
+//# sourceMappingURL=sync-markets.js.map

package/dist/sync/sync-markets.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-markets.js","sourceRoot":"","sources":["../../src/sync/sync-markets.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,SAAe,WAAW;;QACrB,cAAc;QACd,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;YACrD,OAAO,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC;YACxD,SAAS,EAAE,CAAC;YACZ,OAAO,EAAE,QAAQ;SACpB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;YACzC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACf,IAAI,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;oBACvD,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB;iBACzC;YACL,CAAC,CAAC,CAAA;QACN,CAAC,CAAC;aACD,KAAK,CAAC,GAAG,CAAC,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,wCAAwC,GAAG,GAAG,CAAC,CAAA;QAC/D,CAAC,CAAC,CAAA;IACN,CAAC;CAAA;AAED,eAAe,WAAW,CAAC"}

package/dist/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":""}

package/dist/util.js

@@ -0,0 +1 @@
+//# sourceMappingURL=util.js.map

package/dist/util.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":""}

package/package.json

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

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[opportunityService.getEthNetwork()][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
+        const disputeContract = await disputeContractfactory.deploy(relationshipAddress, addressMap['rinkeby'][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[opportunityService.getEthNetwork()]['Dai'])
+    const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['rinkeby']['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[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
+const txResult = new Contract(addressMap['rinkeby'][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 = 'rinkeby' //'rinkeby'
+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' //opportunityService.getEthNetwork()
 
 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')
 }