opportunity-service 0.0.504 → 0.0.509

package/dist/sync/sync-markets.js

@@ -1,23 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -27,26 +7,22 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const OpportunityService_1 = __importDefault(require("../OpportunityService"));
-const addressMap = __importStar(require("../blockchain/addresses.json"));
-const constants_1 = require("../constants");
-const process_log_1 = require("./process/process-log");
+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_1.default.getProviderInterface().getLogs({
-            address: addressMap[constants_1.Contracts.MARKET_FACTORY],
+        yield opportunityService.getProviderInterface().getLogs({
+            address: addressMap[opportunityService.getEthNetwork()][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) {
-                    (0, process_log_1.processLog)(log); // keccashinside here
+                    processLog(log); // keccashinside here
                 }
             });
         })
@@ -55,5 +31,5 @@ function syncMarkets() {
         });
     });
 }
-exports.default = syncMarkets;
+export default syncMarkets;
 //# sourceMappingURL=sync-markets.js.map

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,+EAAuD;AACvD,yEAA2D;AAC3D,4CAAyC;AACzC,uDAAmD;AAEnD,SAAe,WAAW;;QACrB,cAAc;QACd,MAAM,4BAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;YACrD,OAAO,EAAE,UAAU,CAAC,qBAAS,CAAC,cAAc,CAAC;YAC7C,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,IAAA,wBAAU,EAAC,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,kBAAe,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,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,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,cAAc,CAAC;YACjF,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

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=types.js.map

package/gateways.all.json

@@ -0,0 +1,190 @@
+{
+    "main":{
+       "web3":[
+          {
+             "uri":"https://xdai1.vocdoni.net"
+          },
+          {
+             "uri":"https://xdai2.vocdoni.net"
+          },
+          {
+             "uri":"https://xdai3.vocdoni.net"
+          },
+          {
+             "uri":"https://dai.poa.network"
+          }
+       ],
+       "dvote":[
+          {
+             "uri":"wss://gw4.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"02e7d206ee636bc170336002170b9f01d71488632fa3f4dfa895d423f93a50baeb"
+          },
+          {
+             "uri":"wss://gw3.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"03fa03644287f3ab2d700dcad0ad042a2e45ed5f1db889f8d33f027c99adb4715e"
+          },
+          {
+             "uri":"https://gw4.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"02e7d206ee636bc170336002170b9f01d71488632fa3f4dfa895d423f93a50baeb"
+          },
+          {
+             "uri":"https://gw3.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"03fa03644287f3ab2d700dcad0ad042a2e45ed5f1db889f8d33f027c99adb4715e"
+          }
+       ]
+    },
+    "stage":{
+       "web3":[
+          {
+             "uri":"https://xdai1.vocdoni.net"
+          },
+          {
+             "uri":"https://xdai2.vocdoni.net"
+          },
+          {
+             "uri":"https://xdai3.vocdoni.net"
+          },
+          {
+             "uri":"https://dai.poa.network"
+          }
+       ],
+       "dvote":[
+          {
+             "uri":"wss://gw1.stg.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"029b5470ec884e8f74f2ca7e3ed0698914f762fd092e7d49c77d4d6c3cce261cdd"
+          },
+          {
+             "uri":"wss://gw2.stg.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"02012069e5481818a0e3c2768451334f4d0e166d0943027e2446941bdc2d73cef3"
+          },
+          {
+             "uri":"https://gw1.stg.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"029b5470ec884e8f74f2ca7e3ed0698914f762fd092e7d49c77d4d6c3cce261cdd"
+          },
+          {
+             "uri":"https://gw2.stg.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"02012069e5481818a0e3c2768451334f4d0e166d0943027e2446941bdc2d73cef3"
+          }
+       ]
+    },
+    "dev":{
+       "web3":[
+          {
+             "uri":"https://sokol.poa.network"
+          },
+          {
+             "uri":"https://sokol.vocdoni.net"
+          }
+       ],
+       "dvote":[
+          {
+             "uri":"https://gw2.dev.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"02b42acf7899a8884168b0e62d8804501ce3330b4185f14805cd74b0e310da6746"
+          },
+          {
+             "uri":"wss://gw2.dev.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"02b42acf7899a8884168b0e62d8804501ce3330b4185f14805cd74b0e310da6746"
+          },
+          {
+             "uri":"https://gw3.dev.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"03961c89aef41d4bd8baf6aad35e06340541c67946026fcb165db59f2cdf7e0a7b"
+          },
+          {
+             "uri":"wss://gw3.dev.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"03961c89aef41d4bd8baf6aad35e06340541c67946026fcb165db59f2cdf7e0a7b"
+          },
+          {
+             "uri":"https://gw4.dev.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"03e6c84557338a9cdfd510d17f90f9fcda7cbefac0fcdcb7a60b0e5fb31d2e4523"
+          },
+          {
+             "uri":"wss://gw4.dev.vocdoni.net/dvote",
+             "apis":[
+                "file",
+                "vote",
+                "census",
+                "results"
+             ],
+             "pubKey":"03e6c84557338a9cdfd510d17f90f9fcda7cbefac0fcdcb7a60b0e5fb31d2e4523"
+          }
+       ]
+    }
+ }

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "opportunity-service",
-  "version": "0.0.504",
+  "version": "0.0.509",
   "description": "A service layer that connects all services between the blockchain and ui.",
   "main": "index.js",
-  "scripts": {},
+  "scripts": {
+    "test": "node --experimental-vm-modules node_modules/.bin/jest",
+    "coverage": "jest --coverage"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/OpportunityProtocol/opportunity-service.git"
@@ -13,38 +16,48 @@
   "bugs": {
     "url": "https://github.com/OpportunityProtocol/opportunity-service/issues"
   },
+  "jest": {
+    "preset": "ts-jest",
+    "testEnvironment": "node",
+    "transform": {
+      "node_modules/variables/.+\\.(j|t)sx?$": "ts-jest"
+    },
+    "transformIgnorePatterns": [
+      "node_modules/(?!variables/.*)"
+    ]
+  },
   "homepage": "https://github.com/OpportunityProtocol/opportunity-service#readme",
   "devDependencies": {
+    "@types/jest": "^27.0.3",
+    "@types/mocha": "^9.0.0",
     "@types/node": "^14.14.41",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "chai-bn": "^0.2.1",
-    "mocha": "^8.3.2"
+    "jest": "^27.3.1",
+    "mocha": "^8.4.0",
+    "ts-jest": "^27.0.7",
+    "typescript": "^4.5.2"
   },
   "dependencies": {
     "@toruslabs/torus-embed": "^1.10.14",
     "@types/sqlite3": "^3.1.7",
     "@types/web3": "^1.2.2",
-    "body-parser": "^1.19.0",
+    "assert": "^2.0.0",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "dotenv": "^8.2.0",
+    "dvote-js": "^1.13.3",
     "ethereumjs-tx": "^2.1.2",
     "ethers": "^5.2.0",
     "ethrpc": "^6.2.4",
     "express": "^4.17.1",
     "fortmatic": "^2.2.1",
-    "helmet": "^4.6.0",
     "ipfs": "^0.54.4",
     "ipfs-api": "^26.1.2",
     "ipfs-core": "^0.7.1",
     "ipfs-http-client": "^49.0.4",
-    "knex": "^0.95.5",
     "md5": "^2.3.0",
-    "mongodb": "^3.6.9",
-    "mongoose": "^5.12.12",
-    "sqlite3": "^5.0.2",
-    "typescript": "^4.4.3",
     "web3": "^1.3.5"
   }
 }

package/src/OpportunityService.ts

@@ -23,6 +23,7 @@ class OpportunityService {
     private opportunityLogger = null;
     private storageProvider = opportunityStorageProvider;
     private currentAccount = null;
+    private ethNetwork;
 
 
     public api  = opportunityAPI;
@@ -69,6 +70,14 @@ class OpportunityService {
         startEventListeners(eventDictionary, onComplete);
     }
 
+    setEthNetwork(network) {
+        this.ethNetwork = network;
+    }
+
+    getEthNetwork() {
+        return this.ethNetwork;
+    }
+
     async startService() {
         if (this.running) { return; }
 

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

@@ -0,0 +1,42 @@
+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 addressMap from '../../blockchain/addresses.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, addressMap[opportunityService.getEthNetwork()][Contracts.SCHEDULER], 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

@@ -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['Dai'], addressMap['cDai'], addressMap['Banker'])
+    const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap[opportunityService.getEthNetwork()]['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[Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
+const txResult = new Contract(addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
 .connect(opportunityService.getSignersInterface())
 .functions
 .registerNewUser(universalAddress)

package/src/api/internal/abis.ts

@@ -8,5 +8,5 @@ export default {
     'UserSummary': abiMap['UserSummary'],
     'UserRegistration': abiMap['UserRegistration'],
     'UserSummaryFactory': abiMap['UserSummaryFactory'],
-    'Banker': abiMap['Banker']
+    'Dispute': abiMap['Dispute']
 }

package/src/api/internal/addresses.ts

@@ -1,9 +1,11 @@
+import opportunityService from '../../OpportunityService';
 import * as addressMap from '../../blockchain/addresses.json';
 
+const ethNetwork = opportunityService.getEthNetwork()
+
 export default {
-    'MarketFactory': addressMap['MarketFactory'],
-    'UserRegistration': addressMap['UserRegistration'],
-    'Dai': addressMap['Dai'],
-    'cDai': addressMap['cDai'],
-    'Banker': addressMap['Banker']
+    'MarketFactory': addressMap[ethNetwork]['MarketFactory'],
+    'UserRegistration': addressMap[ethNetwork]['UserRegistration'],
+    'Dai': addressMap[ethNetwork]['Dai'],
+    'Scheduler': addressMap[ethNetwork]['Scheduler']
 }

package/src/api/voting/census.ts

@@ -0,0 +1,39 @@
+import { providers } from "ethers"
+import { CensusOffChainApi, CensusOffChain } from 'dvote-js'
+
+import gwPool from "./connect"
+
+let merkleTreeOrigin: string
+let merkleRoot: string
+
+
+async function publishVoteCensus(
+    censusName: string, 
+    entityWallet: providers.JsonRpcSigner, 
+    adminPubKey: string, 
+    accountsToPublicKeys: Array<{ address: string, pubKey: string }>
+    ) {
+    // Prepare the census parameters
+    const adminPublicKeys = [adminPubKey]
+    const publicKeyClaims : { key: string, value: string }[] = accountsToPublicKeys.map(account => {
+        const hashedAddress = CensusOffChain.Anonymous.digestPublicKey(BigInt(account.pubKey), BigInt(account.pubKey))
+        const value = ""
+        return { key: hashedAddress, value }
+    }) // hash the keys
+
+    // As the census does not exist yet, we create it (optional when it exists)
+    let { censusId } = await CensusOffChainApi.addCensus(censusName, adminPublicKeys, gwPool, entityWallet)
+    console.log(`Census added: "${censusName}" with ID ${censusId}`)
+
+    // Add claims to the new census
+    let result = await CensusOffChainApi.addClaimBulk(censusId, publicKeyClaims, true, gwPool, entityWallet)
+    console.log("Added", accountsToPublicKeys.length, "claims to", censusId)
+    if (result.invalidClaims.length > 0) console.error("Invalid claims", result.invalidClaims)
+
+    merkleRoot = await CensusOffChainApi.getRoot(censusId, gwPool)
+    console.log("Census Merkle Root", merkleRoot)
+
+    // Make it available publicly
+    merkleTreeOrigin = await CensusOffChainApi.publishCensus(censusId, gwPool, entityWallet)
+    console.log("Census published on", merkleTreeOrigin)
+}

package/src/api/voting/connect.ts

@@ -0,0 +1,34 @@
+import { 
+    GatewayPool, 
+    IGatewayDiscoveryParameters, 
+    EthNetworkID,
+    VocdoniEnvironment
+ } from "dvote-js"
+
+let gwPool : GatewayPool  = null
+
+export async function connectGateways(
+    ethNetworkId: EthNetworkID, 
+    environment: VocdoniEnvironment,
+    bootnodesContentUri: string
+    ) {
+    console.log("Connecting to the gateways")
+
+        //gateway options
+        const options: IGatewayDiscoveryParameters = {
+            networkId: ethNetworkId,
+            environment,
+            bootnodesContentUri,
+            numberOfGateways: 2,
+            // timeout: 10000,
+        }
+    
+       const pool = await GatewayPool.discover(options)
+       return pool
+}
+
+async function disconnectGateways() {
+    gwPool.disconnect()
+}
+
+export default gwPool

package/src/api/voting/entity.ts

@@ -0,0 +1,33 @@
+import { EntityMetadata, EntityApi, EntityMetadataTemplate, GatewayPool } from "dvote-js"
+import { providers } from 'ethers'
+import gwPool from "./connect"
+
+/**
+ * Vocdoni Docs:
+ * We created JSON metadata containing the custom details of our entity
+ * We pinned the JSON content on IPFS using a gateway from the pool
+ * The hash of our metadata is QmdK5TnHDXPt4xozkuboyKP94RTrUxFr1z9Pkv5qhfahFG and should be available from any IPFS peer (opens new window)
+ * An Ethereum transaction was sent to the entities contract, defining the pointer to our new metadata.
+ * The value on the smart contract can only be updated by our wallet, the blockchain ensures the integrity of our data and IPFS ensures its global availability.
+ * 
+ * @param entity 
+ * @param entityAppData 
+ */
+export async function registerEntity(pool : GatewayPool, entity, address) {
+// Make a copy of the metadata template and customize it
+
+const entityMetadata: EntityMetadata = Object.assign({}, EntityMetadataTemplate)
+
+entityMetadata.name.default = "App"
+entityMetadata.description.default = "App"
+/*entityMetadata.media = {
+    avatar: 'https://my-organization.org/logo.png',
+    header: 'https://my-organization.org/header.jpeg'
+}*/
+entityMetadata.actions = []
+
+const contentUri = await EntityApi.setMetadata(address, entityMetadata, entity, pool)
+// Show stored values
+console.log("The entity has been defined")
+console.log(contentUri)
+}