opportunity-service 0.0.659 → 0.0.660

package/src/events/sync-with-ethereum-node.ts

@@ -8,11 +8,9 @@ import syncMarkets from '../sync/sync-markets';
 import syncJobs from '../sync/sync-jobs';
 
 async function syncWithEthereumNode(): Promise<void> {
-    console.log('Syncing with ethereum node..');
     const highestBlockNumber = 1//blockMap[Contracts.MARKET_FACTORY]; //get highest block number form db
 
     syncMarkets()
-    //syncJobs()
 }
 
 export { syncWithEthereumNode };

package/src/sync/process/process-log.ts

@@ -7,7 +7,6 @@ import { ethers, utils } from "ethers";
 import { hexZeroPad } from "@ethersproject/bytes";
 import { decode } from "node:punycode";
 import { processWorkRelationshipCreatedEvent } from "./processWorkRelationshipCreated";
-import { processDisputeInvolvement } from "./processDisputeInvolvement";
 /**
  * Retrieves topics and process the approppriate log
  * @param log 
@@ -24,7 +23,6 @@ import { processDisputeInvolvement } from "./processDisputeInvolvement";
  *   },{...}]
  */
 function processLog(log) {
-    console.log(log)
     processLogEvents(log);
 }
 
@@ -56,12 +54,8 @@ function processLogEvents(log) {
             case "WorkRelationshipCreated":
                 processWorkRelationshipCreatedEvent(log);
                 break;
-            case "DisputeInvolvement":
-                processDisputeInvolvement(log)
             default:
         }
-    } else {
-        console.log('Event is null.. exiting processing.')
     }
 }
 

package/src/sync/process/processMarketCreatedLog.ts

@@ -23,10 +23,6 @@ function processMarketCreatedEvent(log) {
     const marketName = args[3];
     const marketType = args[4];
 
-    console.log('Processing ' + signature + ' with args: ' 
-    + 'Market Address: ' + marketAddress + ', Index: ' 
-    + marketIndex + ', Owner: ' + marketOwner, ', Market Name: ' + marketName, + ', and Market Type: ' + marketType);
-
     let marketData = {
         marketAddress,
         marketIndex,

package/src/sync/process/processUserAssignedTrueIdentification.ts

@@ -15,12 +15,10 @@ function processAssignedTrueIdentification(log) {
     const registeredUniversalAddress = args[0];
     const userSummaryContractAddress = args[1];
 
-    console.log('Processing: ' + 'processAssignedTrueIdentification event with args: ' + registeredUniversalAddress + ' and ' + userSummaryContractAddress);
-
     const trueIdentificationData = { registeredUniversalAddress, userSummaryContractAddress }
     opportunityEventEmitter.emit(UserEvents.UserAssignedTrueIdentification, trueIdentificationData);
     } catch(error) {
-        console.log('processAssignedTrueIdentification: ' + error);
+        console.log(error);
     }
 }
 

package/src/sync/process/processUserRegistered.ts

@@ -13,13 +13,9 @@ function processUserRegistered(log) {
     const { args, signature } = decodedLog;
 
     const registeredUniversalAddress = args[0];
-
-    console.log('Processing: ' + 'UserRegistered event with args: ' + registeredUniversalAddress);
-
-    console.log('Successfully processedUserRegistered');
         opportunityEventEmitter.emit(UserEvents.UserRegistered, registeredUniversalAddress);
     } catch(error) {
-        console.log('processUserRegistered: ' + error);
+       console.log(error)
     }
 }
 

package/src/sync/process/processUserSummaryCreated.ts

@@ -15,8 +15,6 @@ function processUserSummaryCreated(log) {
     const userSummaryContractAddress = args[0];
     const userRegistrationNumber = args[1];
     const registeredUniversalAddress = args[2]
-
-    console.log('Processing: ' + 'processUserSummaryCreated event with args: ' + registeredUniversalAddress + ' and ' + userSummaryContractAddress);
     const userSummaryData = { userSummaryContractAddress, userRegistrationNumber, registeredUniversalAddress }
     opportunityEventEmitter.emit(UserEvents.UserSummaryCreated, userSummaryData);
     } catch(error) {

package/src/sync/process/processWorkRelationshipCreated.ts

@@ -21,11 +21,7 @@ function processWorkRelationshipCreatedEvent(log) {
 
     const relationshipOwner = args[0];
     const relationshipAddress = args[1];
-    const relationshipMarketAddress = args[2];
-
-    console.log('Processing ' + signature + ' with args: ' 
-    + 'Owner: ' + relationshipOwner + ', Address: '  + relationshipAddress + ', and Market Address: ' + relationshipAddress);
-
+    const relationshipMarketAddress = args[2]
     const relationshipContractInstance = new ethers.Contract(relationshipAddress, abiMap[Contracts.WORK_RELATIONSHIP], opportunityService.getSignersInterface())
     const relationshipStatus = 0 //relationshipContractInstance.get_contractStatus();
     const relationshipType = 0;

package/src/sync/sync-jobs.ts

@@ -12,15 +12,14 @@ async function syncJobs(marketAddress) {
         toBlock: 'latest',
         topics: ['WorkRelationshipCreated(address,address,address)']
     }).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)
+    .catch(error => {
+        console.log(error)
     })
 }
 }

package/src/sync/sync-market-disputes.ts

@@ -1,27 +0,0 @@
-import opportunityService from "../OpportunityService";
-import { processLog } from './process/process-log';
-import * as addressMap from '../blockchain/addresses.json';
-import { Contracts } from '../constants';
-
-async function syncMarketDisputes(marketAddress) {
-    if (opportunityService.getProviderInterface()) {
-     await opportunityService.getProviderInterface().getLogs({ 
-        address: marketAddress, 
-        fromBlock: 1, 
-        toBlock: 'latest',
-        topics: ['MarketDispute(address,address,address,address,address)']
-    }).then((logs) => {
-        console.log('Found logs.. Processing sync market disputes')
-        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 syncMarketDisputes;

package/src/sync/sync-markets.ts

@@ -4,7 +4,6 @@ import { Contracts } from '../constants';
 import { processLog } from './process/process-log';
 
 async function syncMarkets() {
-    console.log('syncMarkets: ' + addressMap[opportunityService.getEthNetwork()][Contracts.MARKET_FACTORY])
      if (opportunityService.getProviderInterface()) {
      //sync Markets
      await opportunityService.getProviderInterface().getLogs({ 
@@ -12,16 +11,15 @@ async function syncMarkets() {
         fromBlock: 1, 
         toBlock: 'latest' 
     }).then((logs) => {
-        console.log('Found logs.. Processing...')
-        console.log(logs)
+
         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)
+    .catch(error => {
+        console.log(error)
     })
     }
 }

package/src/types.ts

@@ -38,36 +38,4 @@ export type FilterParams = {
     fromBlock: string | number,
     toBlock: string | number,
     address: string
-}
-
-/* Contracts */
-
-export type WorkRelationshipMetadata = {
-    solution: any,
-    attachments: Array<string>,
-    definitionOfDone: string,
-    desiredDuration: string,
-    description: string,
-}
-
-export interface EventCallbackDictionary { [eventName : string]: () => any }
-
-
-export type DisputeDoc = {
-    _id: string, 
-    collection: string, //dispute
-    disputeAddress: string,
-    vocdoniProcessId: string
-}
-
-export type WorkRelationshipDoc = {
-    _id: string,
-    collection: string //relationship
-}
-
-export type UserSummaryDoc = {
-    _id: string, 
-    collection: string, //summary
-    universalAddress: string,
-    userSummaryAddress: string
 }

package/dist/sync/process/processDisputeInvolvement.js

@@ -1,33 +0,0 @@
-import { Contracts, ExchangeEvents } from '../../constants';
-import * as abiMap from '../../blockchain/abi.json';
-import { ethers } from 'ethers';
-import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
-/**
- * WorkRelationshipCreated(address owner, address relationship, address market)
- * @param log
- * @returns
- */
-function processDisputeInvolvement(log) {
-    try {
-        const iface = new ethers.utils.Interface(abiMap[Contracts.DISPUTE]);
-        const decodedLog = iface.parseLog(log);
-        const { args, signature } = decodedLog;
-        const employer = args[0];
-        const worker = args[1];
-        const relationship = args[2];
-        const disputeAddress = args[3];
-        const disputeData = {
-            employer,
-            worker,
-            relationship,
-            address: disputeAddress
-        };
-        console.log("Processing a dispute created event with address: " + disputeData);
-        opportunityEventEmitter.emit(ExchangeEvents.DisputeInvolvement, disputeData);
-    }
-    catch (error) {
-        console.log(error);
-    }
-}
-export { processDisputeInvolvement };
-//# sourceMappingURL=processDisputeInvolvement.js.map

package/dist/sync/process/processDisputeInvolvement.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"processDisputeInvolvement.js","sourceRoot":"","sources":["../../../src/sync/process/processDisputeInvolvement.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAgB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAG3E;;;;GAIG;AACH,SAAS,yBAAyB,CAAC,GAAG;IAClC,IAAI;QACJ,MAAM,KAAK,GAAe,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAChF,MAAM,UAAU,GAAoB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAEvC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAE/B,MAAM,WAAW,GAAG;YAChB,QAAQ;YACR,MAAM;YACN,YAAY;YACZ,OAAO,EAAE,cAAc;SAC1B,CAAA;QAED,OAAO,CAAC,GAAG,CAAC,mDAAmD,GAAG,WAAW,CAAC,CAAA;QAE9E,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,kBAAkB,EAAE,WAAW,CAAC,CAAC;KAChF;IAAC,OAAM,KAAK,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACrB;AACD,CAAC;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/sync/process/processMarketDisputes.js

@@ -1,34 +0,0 @@
-import { Contracts, ExchangeEvents } from '../../constants';
-import * as abiMap from '../../blockchain/abi.json';
-import { ethers } from 'ethers';
-import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
-/**
- * WorkRelationshipCreated(address owner, address relationship, address market)
- * @param log
- * @returns
- */
-function processMarketDispute(log) {
-    try {
-        const iface = new ethers.utils.Interface(abiMap[Contracts.DISPUTE]);
-        const decodedLog = iface.parseLog(log);
-        const { args, signature } = decodedLog;
-        const employer = args[0];
-        const worker = args[1];
-        const relationship = args[2];
-        const disputeAddress = args[3];
-        const marketAddress = args[4];
-        const disputeData = {
-            employer,
-            worker,
-            relationship,
-            address: disputeAddress
-        };
-        console.log("Processing a dispute created in the market: " + marketAddress);
-        opportunityEventEmitter.emit(ExchangeEvents.MarketDispute, disputeData);
-    }
-    catch (error) {
-        console.log(error);
-    }
-}
-export { processMarketDispute };
-//# sourceMappingURL=processMarketDisputes.js.map

package/dist/sync/process/processMarketDisputes.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"processMarketDisputes.js","sourceRoot":"","sources":["../../../src/sync/process/processMarketDisputes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAgB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAG3E;;;;GAIG;AACH,SAAS,oBAAoB,CAAC,GAAG;IAC7B,IAAI;QACJ,MAAM,KAAK,GAAe,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAChF,MAAM,UAAU,GAAoB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAEvC,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QACtB,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAC5B,MAAM,cAAc,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAA;QAE7B,MAAM,WAAW,GAAG;YAChB,QAAQ;YACR,MAAM;YACN,YAAY;YACZ,OAAO,EAAE,cAAc;SAC1B,CAAA;QAED,OAAO,CAAC,GAAG,CAAC,8CAA8C,GAAG,aAAa,CAAC,CAAA;QAE3E,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;KAC3E;IAAC,OAAM,KAAK,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACrB;AACD,CAAC;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/sync/sync-disputes.js

@@ -1,37 +0,0 @@
-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 syncCreatedDisputes(userSummaryAddress) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (opportunityService.getProviderInterface()) {
-            yield opportunityService.getProviderInterface().getLogs({
-                address: userSummaryAddress,
-                fromBlock: 1,
-                toBlock: 'latest',
-                topics: [
-                    'DisputeCreated(address,address,address,address)'
-                ]
-            }).then((logs) => {
-                console.log('Found logs.. Processing sync disputes');
-                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 syncCreatedDisputes;
-//# sourceMappingURL=sync-disputes.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"sync-disputes.js","sourceRoot":"","sources":["../../src/sync/sync-disputes.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,SAAe,mBAAmB,CAAC,kBAAkB;;QACjD,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,EAAE;YAC9C,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;gBACrD,OAAO,EAAE,kBAAkB;gBAC3B,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE;oBACJ,iDAAiD;iBACpD;aACJ,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;gBACpD,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACf,IAAI,GAAG,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE;wBACvD,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB;qBACzC;gBACL,CAAC,CAAC,CAAA;YACN,CAAC,CAAC;iBACD,KAAK,CAAC,GAAG,CAAC,EAAE;gBACT,OAAO,CAAC,GAAG,CAAC,wCAAwC,GAAG,GAAG,CAAC,CAAA;YAC/D,CAAC,CAAC,CAAA;SACL;IACD,CAAC;CAAA;AAED,eAAe,mBAAmB,CAAC"}

package/src/sync/process/processDisputeInvolvement.ts

@@ -1,42 +0,0 @@
-import { Contracts, ExchangeEvents, MarketEvents } from '../../constants';
-import * as abiMap from '../../blockchain/abi.json';
-import * as addressMap from '../../blockchain/addresses.json';
-import opportunityService from '../../OpportunityService';
-import { Contract } from '@ethersproject/contracts';
-import { ethers } from 'ethers';
-import { AbiCoder, EventFragment, Interface, LogDescription, Result } from '@ethersproject/abi';
-import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
-
-
-/**
- * WorkRelationshipCreated(address owner, address relationship, address market)
- * @param log
- * @returns
- */
-function processDisputeInvolvement(log) {
-    try {
-    const iface : Interface = new ethers.utils.Interface(abiMap[Contracts.DISPUTE]);
-    const decodedLog : LogDescription = iface.parseLog(log);
-    const { args, signature } = decodedLog;
-
-    const employer = args[0]
-    const worker = args[1]
-    const relationship = args[2]
-    const disputeAddress = args[3];
-
-    const disputeData = {
-        employer,
-        worker,
-        relationship,
-        address: disputeAddress
-    }
-
-    console.log("Processing a dispute created event with address: " + disputeData)
-
-    opportunityEventEmitter.emit(ExchangeEvents.DisputeInvolvement, disputeData);
-} catch(error) {
-    console.log(error)
-}
-}
-
-export { processDisputeInvolvement };

package/src/sync/process/processMarketDisputes.ts

@@ -1,43 +0,0 @@
-import { Contracts, ExchangeEvents, MarketEvents } from '../../constants';
-import * as abiMap from '../../blockchain/abi.json';
-import * as addressMap from '../../blockchain/addresses.json';
-import opportunityService from '../../OpportunityService';
-import { Contract } from '@ethersproject/contracts';
-import { ethers } from 'ethers';
-import { AbiCoder, EventFragment, Interface, LogDescription, Result } from '@ethersproject/abi';
-import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
-
-
-/**
- * WorkRelationshipCreated(address owner, address relationship, address market)
- * @param log
- * @returns
- */
-function processMarketDispute(log) {
-    try {
-    const iface : Interface = new ethers.utils.Interface(abiMap[Contracts.DISPUTE]);
-    const decodedLog : LogDescription = iface.parseLog(log);
-    const { args, signature } = decodedLog;
-
-    const employer = args[0]
-    const worker = args[1]
-    const relationship = args[2]
-    const disputeAddress = args[3];
-    const marketAddress = args[4]
-
-    const disputeData = {
-        employer,
-        worker,
-        relationship,
-        address: disputeAddress
-    }
-
-    console.log("Processing a dispute created in the market: " + marketAddress)
-
-    opportunityEventEmitter.emit(ExchangeEvents.MarketDispute, disputeData);
-} catch(error) {
-    console.log(error)
-}
-}
-
-export { processMarketDispute };

package/src/sync/sync-disputes.ts

@@ -1,29 +0,0 @@
-import opportunityService from "../OpportunityService";
-import { processLog } from './process/process-log';
-import * as addressMap from '../blockchain/addresses.json';
-import { Contracts } from '../constants';
-
-async function syncCreatedDisputes(userSummaryAddress) {
-    if (opportunityService.getProviderInterface()) {
-     await opportunityService.getProviderInterface().getLogs({ 
-        address: userSummaryAddress, 
-        fromBlock: 1, 
-        toBlock: 'latest',
-        topics: [
-            'DisputeCreated(address,address,address,address)'
-        ]
-    }).then((logs) => {
-        console.log('Found logs.. Processing sync disputes')
-        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 syncCreatedDisputes;