opportunity-service 0.0.657 → 0.0.661

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

@@ -1,35 +1 @@
-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 syncMarketDisputes(marketAddress) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (opportunityService.getProviderInterface()) {
-            yield 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;
 //# sourceMappingURL=sync-market-disputes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"sync-market-disputes.js","sourceRoot":"","sources":["../../src/sync/sync-market-disputes.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,SAAe,kBAAkB,CAAC,aAAa;;QAC3C,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,EAAE;YAC9C,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;gBACrD,OAAO,EAAE,aAAa;gBACtB,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE,CAAC,wDAAwD,CAAC;aACrE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAA;gBAC3D,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,kBAAkB,CAAC"}
+{"version":3,"file":"sync-market-disputes.js","sourceRoot":"","sources":["../../src/sync/sync-market-disputes.ts"],"names":[],"mappings":""}

package/dist/sync/sync-markets.js

@@ -13,7 +13,6 @@ import { Contracts } from '../constants';
 import { processLog } from './process/process-log';
 function syncMarkets() {
     return __awaiter(this, void 0, void 0, function* () {
-        console.log('syncMarkets: ' + addressMap[opportunityService.getEthNetwork()][Contracts.MARKET_FACTORY]);
         if (opportunityService.getProviderInterface()) {
             //sync Markets
             yield opportunityService.getProviderInterface().getLogs({
@@ -21,16 +20,14 @@ 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/dist/sync/sync-markets.js.map

@@ -1 +1 @@
-{"version":3,"file":"sync-markets.js","sourceRoot":"","sources":["../../src/sync/sync-markets.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,UAAU,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,SAAe,WAAW;;QACtB,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAA;QACtG,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,EAAE;YAC/C,cAAc;YACd,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;gBACrD,OAAO,EAAE,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC;gBACjF,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,QAAQ;aACpB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;gBACzC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;gBACjB,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;SACD;IACL,CAAC;CAAA;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"sync-markets.js","sourceRoot":"","sources":["../../src/sync/sync-markets.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,UAAU,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,SAAe,WAAW;;QACrB,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,EAAE;YAC/C,cAAc;YACd,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;gBACrD,OAAO,EAAE,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC;gBACjF,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,QAAQ;aACpB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAEb,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,KAAK,CAAC,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YACtB,CAAC,CAAC,CAAA;SACD;IACL,CAAC;CAAA;AAED,eAAe,WAAW,CAAC"}

package/package.json

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

package/src/OpportunityService.ts

@@ -45,7 +45,6 @@ class OpportunityService {
         this.ethNetwork = 'mainnet'
 
         this.opportunityProvider = new ethers.providers.JsonRpcProvider(/*process.env.NODE_ENV == 'dev' ?  "https://eth-mainnet.alchemyapi.io/v2/JKVeBInuvm4wq9_8fECUmazLbm7Vpv5V" : "https://eth-mainnet.alchemyapi.io/v2/7d2CRio84usjQwU8tRPG75rqV1wJmX_W"*/)
-        console.log(this.opportunityProvider)
     }
 
     /**
@@ -94,8 +93,6 @@ class OpportunityService {
                 this.ethNetwork = 'rinkeby'
         }
 
-        console.log(networkId)
-
         //this.storageProvider = new OpportunityStorageProvider(dbAddress)
     }
 
@@ -110,10 +107,8 @@ class OpportunityService {
     async startService() {
         if (this.running) { return; }
 
-        console.log('Starting service...');
         this.sync();
         this.running = true;
-        console.log('Finished starting service...')
     }
 
     shutdownService() {
@@ -133,11 +128,9 @@ class OpportunityService {
             .then(() => {
                 this.syncing = false;
                 this.eventEmitter.emit(RPCEvents.StopSyncing);
-                console.log('Finished syncing ethereum node.')
                 this.syncing = false;
             })
             .catch(err => {
-                console.log('Error while syncing ethereum node: ' + err)
                 this.syncing = false;
             })
     }
@@ -152,12 +145,8 @@ class OpportunityService {
 
     getProviderInterface() : providers.JsonRpcProvider {
         if (this.opportunityProvider) {
-            console.log('Provider is not null')
-            console.log(this.opportunityProvider)
             return this.opportunityProvider
-        } else {
-            console.log('provider is null')
-        }  
+        }
    
         return this.ethersProvider;
     }

package/src/api/ethereum/sendAsync.ts

@@ -19,10 +19,6 @@ export async function sendAsync(method, params, from) {
           const s = '0x' + realResult.slice(64, 128);
           const v = parseInt(realResult.substring(128, 130), 16);
 
-          console.log('Service: ' + realResult)
-          console.log('R: ' + r)
-          console.log('S: ' + s)
-          console.log('V: ' + v)
           resolve({
               v, r, s
           })

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

@@ -1,41 +0,0 @@
-import { FakeTransaction, Transaction, TxData } from "ethereumjs-tx";
-import { Contracts, ContractType } from "../../constants";
-import opportunityEventEmitter from "../../events/OpportunityEventEmitter";
-import { ParamObject } from "../../types";
-
-import * as abiMap from '../../blockchain/abi.json';
-import * as bytecodeMap from '../../blockchain/bytecode.json';
-import opportunityService from "../../OpportunityService";
-import { ethers, ContractFactory } from 'ethers';
-import opportunityStorageProvider from "../../modules/storage/OpportunityStorageProvider";
-import { Result } from "ethers/lib/utils";
-
-const Tx = require("ethereumjs-tx").Transaction;
-
-async function createDispute(data) : Promise<void> {
-    //createData(data)
-
-    const parsedData = JSON.parse(data)
-    const abi = abiMap[Contracts.DISPUTE]
-
-    const complaintMetadataPointer = parsedData['complaintMetadataPointer']
-    const complaintResponseMetadataPointer = parsedData['complaintResponseMetadataPointer']
-    const relationshipAddress = parsedData['relationshipAddress']
-
-    console.log(abi)
-    console.log(parsedData)
-
-    try {
-        // 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 = await disputeContractfactory.deploy(relationshipAddress, complaintMetadataPointer, complaintResponseMetadataPointer);
-        const txReceipt = await disputeContract.deployTransaction.wait()
-        console.log(txReceipt)
-    } catch(error) {
-        console.log('Service: Caught error creating new job: ' + error);
-    }
-}
-
-export { createDispute }

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

@@ -14,37 +14,25 @@ import { Result } from "ethers/lib/utils";
 const Tx = require("ethereumjs-tx").Transaction;
 
 async function createTask(data) : Promise<void> {
-    console.log('a')
     const parsedData = JSON.parse(data);
     const abi = abiMap[Contracts.MARKET];
-    console.log(abi)
-    console.log(parsedData)
 
     const taskOwner = parsedData["taskOwner"];  
     const taskMarket = parsedData["taskMarket"]
     const taskBounty = Number(parsedData["taskBounty"])
     const taskMetadataPointer = parsedData["taskMetadataPointer"]
-    console.log('b')
-    console.log(taskOwner)
-    console.log(taskMarket)
-    console.log('h')
-    console.log(taskBounty)
-    console.log(taskMetadataPointer)
+    const registrar = addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION]
 
     if (taskOwner == null || taskMarket == 0 || taskBounty == 0 || taskMetadataPointer == '' ) {
         throw new Error('Null value in data')
     }
 
-    console.log('C')
     try {
-        console.log('d')
     const contract = await new ethers.Contract(taskMarket, abi).connect(opportunityService.getSignersInterface());
-    console.log('e')
-    const txResponse = await contract.functions.createJob(ContractType.NORMAL, taskMetadataPointer, addressMap[opportunityService.getEthNetwork()][Contracts.DAI])
+    const txResponse = await contract.functions.createJob(registrar, ContractType.NORMAL, taskMetadataPointer, addressMap[opportunityService.getEthNetwork()][Contracts.DAI])
     const txReceipt = await txResponse.wait()
-    console.log(txReceipt)
     } catch(error) {
-        console.log('Service: Caught error creating new job: ' + error);
+        console.log(error);
     }
 }
 

package/src/api/exchange/enter-work-relationship.ts

@@ -1,61 +0,0 @@
-function enterWorkRelationship(relationshipAddress, evaluationState, callback) {
-    /*const abi = Contract.Market.WorkRelationship.abi;
-    const bytecode = '608060405234801561001057600080fd5b50606460008190555060ca806100276000396000f3fe6080604052348015600f57600080fd5b506004361060325760003560e01c806380219655146037578063ed0109a5146062575b600080fd5b606060048036036020811015604b57600080fd5b8101908080359060200190929190505050607e565b005b6068608c565b6040518082815260200191505060405180910390f35b806000540160008190555050565b6000805490509056fea265627a7a7230582002f975dfd70c1b1f649671805826a83fc9b92457fe7dd245527f56b7776d043464736f6c634300050a0032';
-
-    const contract = opportunityConnectionProvider.getProviderInterface().web3.eth.Contract(JSON.parse(abi)); //web3.eth.Contract(JSON.parse(abi));
-
-    const txParameter : FakeTransaction = {
-        from: opportunityConnectionProvider.getProviderInterface().web3.eth.getAccounts()[0],
-        gasPrice: opportunityConnectionProvider.getProviderInterface().web3.utils.toHex(opportunityConnectionProvider.getProviderInterface().web3.utils.toWei('30', 'gwei'))
-    }
-
-    const isValidWorker = opportunityConnectionProvider.getProviderInterface().web3.eth.Contract(
-        contract, 
-        relationshipAddress)
-        .methods
-        .checkWorkerEvaluation(opportunityConnectionProvider.getProviderInterface().web3.accounts.getAccounts()[0], evaluationState)
-        .send(txParameter, callback)
-        .on('transactionHash', hash => {
-           
-        })
-        .on('confirmation', (confirmationNumber, receipt) => {
-           
-        })
-        .on('receipt', receipt => {
-            // receipt example
-            console.log(receipt);
-        })
-        .on('error', (error, receipt) => { // If the transaction was rejected by the network with a receipt, the second parameter will be the receipt.
-           
-        })
-        .then( receipt => {
-            // receipt can also be a new contract instance, when coming from a "contract.deploy({...}).send()"
-        });
-
-    if (isValidWorker === true) {
-        opportunityConnectionProvider.getProviderInterface().web3.eth.Contract(
-            contract, 
-            relationshipAddress)
-            .methods
-            .createWorkExchange(opportunityConnectionProvider.getProviderInterface().web3.accounts.getAccounts()[0], true)
-            .send(txParameter, callback)
-            .on('transactionHash', hash => {
-               
-            })
-            .on('confirmation', (confirmationNumber, receipt) => {
-               
-            })
-            .on('receipt', receipt => {
-                // receipt example
-                console.log(receipt);
-            })
-            .on('error', (error, receipt) => { // If the transaction was rejected by the network with a receipt, the second parameter will be the receipt.
-               
-            })
-            .then( receipt => {
-                // receipt can also be a new contract instance, when coming from a "contract.deploy({...}).send()"
-            });
-    }*/
-}
-
-export { enterWorkRelationship };

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

@@ -17,14 +17,10 @@ async function registerNewUser() {
             if (typeof msgSender == 'undefined') throw new Error('Message sender is undefined')
 
             const userRegistrationInstance = new ethers.Contract(userRegistrationAddress, userRegistrationInterface, opportunityService.getProviderInterface())
-
-            console.log('Checking true identificaiton of msgSender: ' + msgSender)
             const id = await userRegistrationInstance.getTrueIdentification(msgSender)
-            console.log('The true identificaiton is: ' + id)
 
             if (id == '0x0000000000000000000000000000000000000000')
             {
-                console.log('Registering new user: ' + msgSender)
                 const tx : TransactionResponse = await new Contract(
                     addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
                     .connect(opportunityService.getSignersInterface())
@@ -32,27 +28,19 @@ async function registerNewUser() {
                         from: msgSender
                 })
 
-                console.log(tx)
-
                 const receipt = await tx.wait()
-                console.log('the receipt')
-                console.log(receipt)
 
                 if (Number(receipt.status) === 1) {
-                    console.log('transaction succeeded')
                     resolve(true);
                 } else {
-                    console.log('Transaction failed')
                     resolve(false)
                 }
             } else {
-                console.log('User already registered')
                 resolve(false)
             }
 
     
         } catch(error) {
-            console.log(error)
             reject('An error occurred while trying to complete the registration.')
         }
     })

package/src/api/index.ts

@@ -3,7 +3,6 @@ import syncJobs from "../sync/sync-jobs";
 import syncMarkets from "../sync/sync-markets";
 import { completeRelationship } from "./exchange/complete-relationship";
 import { createTask } from "./exchange/create-task";
-import { enterWorkRelationship } from "./exchange/enter-work-relationship";
 import registerNewUser from "./identity/register-new-user";
 import { createMarket } from "./market/create-market";
 
@@ -16,8 +15,6 @@ import { decryptByPrivateKey, encryptByPublicKey } from "./util/encrypt-by-publi
 import { createEthCryptoCreds } from "./other/create-eth-crypto-creds";
 import { encrypt } from "./provider/encrypt";
 import { decrypt } from "./provider/decrypt";
-import syncCreatedDisputes from "../sync/sync-disputes";
-import syncMarketDisputes from "../sync/sync-market-disputes";
 
 function generateAPI() {
     return {
@@ -33,16 +30,7 @@ function generateAPI() {
         },
         exchange: {
             completeRelationship,
-            createTask,
-            enterWorkRelationship
-        },
-        dispute: {
-            connectGateways: () => {},
-            getOracleClient: () => {},
-            checkVoteResults: () => {},
-            ensureEntityMetadata: () => {},
-            launchNewVote: () => {},
-            submitVote: () => {}
+            createTask
         },
         identity: {
             registerNewUser
@@ -54,9 +42,7 @@ function generateAPI() {
             sync: {
                 syncWithEthereum: syncWithEthereumNode,
                 syncMarkets,
-                syncJobs,
-                syncCreatedDisputes,
-                syncMarketDisputes
+                syncJobs
             }
         },
         provider: {

package/src/api/internal/abis.ts

@@ -2,7 +2,6 @@
 import abiMap from '../../blockchain/abi.json';
 
 function getContractInterface(contract: string) {
-    console.log(abiMap)
     return abiMap[contract]
 }
 
@@ -12,7 +11,5 @@ export default {
     'MarketFactory': abiMap['MarketFactory'],
     'WorkRelationship': abiMap['WorkRelationship'],
     'Market': abiMap['Market'],
-    'UserRegistration': abiMap['UserRegistration'],
-    'Dispute': abiMap['Dispute'],
-    'Participation': abiMap['Participation']
+    'UserRegistration': abiMap['UserRegistration']
 }