opportunity-service 0.0.629 → 0.0.633

package/package.json

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

package/src/OpportunityService.ts

@@ -13,6 +13,7 @@ import opportunityStorageProvider from "./modules/storage/OpportunityStorageProv
 import { EthNetworkID } from "dvote-js";
 import Web3 from 'web3';
 import OpportunityStorageProvider from "./modules/storage/OpportunityStorageProvider";
+import { createAlchemyWeb3 } from "@alch/alchemy-web3"
 
 import { Shh } from 'web3-shh'
 
@@ -20,6 +21,7 @@ class OpportunityService {
     private eventEmitter = opportunityEventEmitter;
     private running: boolean = false;
     private syncing: boolean = false;
+    private opportunityProvider : providers.JsonRpcProvider;
     private ethersProvider : providers.JsonRpcProvider = ethers.getDefaultProvider('http://localhost:8545');
     private ethersSigner : providers.JsonRpcSigner = null;
     private static defaultProvider = new Web3('http://localhost:8545')
@@ -39,7 +41,11 @@ class OpportunityService {
      * construction calls with the `new` operator.
      */
     private constructor() {
+        const web3 = createAlchemyWeb3(process.env.NODE_ENV == 'dev' ?  "https://eth-mainnet.alchemyapi.io/v2/JKVeBInuvm4wq9_8fECUmazLbm7Vpv5V" : "https://eth-mainnet.alchemyapi.io/v2/7d2CRio84usjQwU8tRPG75rqV1wJmX_W");
         this.ethNetwork = 'rinkeby'
+
+        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)
     }
 
     /**
@@ -145,6 +151,14 @@ 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/index.ts

@@ -7,7 +7,7 @@ import { enterWorkRelationship } from "./exchange/enter-work-relationship";
 import registerNewUser from "./identity/register-new-user";
 import { createMarket } from "./market/create-market";
 
-import { abis, events, getContractAddress} from './internal/index'; 
+import { abis, events, getContractAddress, getContractInterface} from './internal/index'; 
 
 import { sendAsync } from './ethereum/sendAsync'
 import { parseCypher } from "./util/parse-cipher";
@@ -29,6 +29,7 @@ function generateAPI() {
         internal: {
             abis: abis,
             getContractAddress,
+            getContractInterface
         },
         exchange: {
             completeRelationship,

package/src/api/internal/abis.ts

@@ -1,5 +1,12 @@
 
-import * as abiMap from '../../blockchain/abi.json';
+import abiMap from '../../blockchain/abi.json';
+
+function getContractInterface(contract: string) {
+    console.log(abiMap)
+    return abiMap[contract]
+}
+
+export { getContractInterface }
 
 export default {
     'MarketFactory': abiMap['MarketFactory'],

package/src/api/internal/addresses.ts

@@ -4,8 +4,5 @@ import { EthNetworkID } from 'dvote-js';
 import { Contracts } from '../../constants';
 
 export default function getContractAddress(network: EthNetworkID, contractName: Contracts): string {
-    console.log(network)
-    console.log(contractName)
-    console.log(addressMap)
     return addressMap[network][contractName]
 }

package/src/api/internal/index.ts

@@ -1,5 +1,5 @@
-import abis from "./abis";
+import abis, { getContractInterface } from "./abis";
 import getContractAddress from "./addresses";
 import events from "./events";
 
-export { abis, getContractAddress, events};
+export { abis, getContractAddress, getContractInterface, events};