opportunity-service 0.0.627 → 0.0.631
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/OpportunityService.js +6 -0
- package/dist/OpportunityService.js.map +1 -1
- package/dist/api/index.js +2 -1
- package/dist/api/index.js.map +1 -1
- package/dist/api/internal/abis.js +6 -1
- package/dist/api/internal/abis.js.map +1 -1
- package/dist/api/internal/addresses.js +0 -3
- package/dist/api/internal/addresses.js.map +1 -1
- package/dist/api/internal/index.js +2 -2
- package/dist/api/internal/index.js.map +1 -1
- package/dist/sync/process/process-log.js +1 -1
- package/dist/sync/process/process-log.js.map +1 -1
- package/dist/sync/process/processMarketCreatedLog.js +1 -1
- package/dist/sync/process/processMarketCreatedLog.js.map +1 -1
- package/package.json +1 -1
- package/src/OpportunityService.ts +9 -0
- package/src/api/index.ts +2 -1
- package/src/api/internal/abis.ts +8 -1
- package/src/api/internal/addresses.ts +0 -3
- package/src/api/internal/index.ts +2 -2
- package/src/sync/process/process-log.ts +1 -1
- package/src/sync/process/processMarketCreatedLog.ts +1 -1
|
@@ -14,6 +14,7 @@ import { ethers } from "ethers";
|
|
|
14
14
|
import { startEventListeners } from "./events/start-event-listeners";
|
|
15
15
|
import opportunityAPI from './api/index';
|
|
16
16
|
import Web3 from 'web3';
|
|
17
|
+
import { createAlchemyWeb3 } from "@alch/alchemy-web3";
|
|
17
18
|
class OpportunityService {
|
|
18
19
|
/**
|
|
19
20
|
* The Singleton's constructor should always be private to prevent direct
|
|
@@ -32,7 +33,9 @@ class OpportunityService {
|
|
|
32
33
|
this.whisperProvider = null;
|
|
33
34
|
this.storage = null;
|
|
34
35
|
this.api = opportunityAPI;
|
|
36
|
+
const web3 = createAlchemyWeb3(process.env.NODE_ENV == 'dev' ? "https://eth-mainnet.alchemyapi.io/v2/JKVeBInuvm4wq9_8fECUmazLbm7Vpv5V" : "https://eth-mainnet.alchemyapi.io/v2/7d2CRio84usjQwU8tRPG75rqV1wJmX_W");
|
|
35
37
|
this.ethNetwork = 'rinkeby';
|
|
38
|
+
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");
|
|
36
39
|
}
|
|
37
40
|
/**
|
|
38
41
|
* The static method that controls the access to the singleton instance.
|
|
@@ -128,6 +131,9 @@ class OpportunityService {
|
|
|
128
131
|
return OpportunityService.defaultProvider;
|
|
129
132
|
}
|
|
130
133
|
getProviderInterface() {
|
|
134
|
+
if (this.opportunityProvider) {
|
|
135
|
+
return this.opportunityProvider;
|
|
136
|
+
}
|
|
131
137
|
return this.ethersProvider;
|
|
132
138
|
}
|
|
133
139
|
getSignersInterface() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpportunityService.js","sourceRoot":"","sources":["../src/OpportunityService.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAA6B,SAAS,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAClF,OAAO,uBAAuB,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAKxE,OAAO,EAAE,MAAM,EAAa,MAAM,QAAQ,CAAC;AAE3C,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AACrE,OAAO,cAAc,MAAM,aAAa,CAAC;AAGzC,OAAO,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"OpportunityService.js","sourceRoot":"","sources":["../src/OpportunityService.ts"],"names":[],"mappings":"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"}
|
package/dist/api/index.js
CHANGED
|
@@ -6,7 +6,7 @@ import { createTask } from "./exchange/create-task";
|
|
|
6
6
|
import { enterWorkRelationship } from "./exchange/enter-work-relationship";
|
|
7
7
|
import registerNewUser from "./identity/register-new-user";
|
|
8
8
|
import { createMarket } from "./market/create-market";
|
|
9
|
-
import { abis, getContractAddress } from './internal/index';
|
|
9
|
+
import { abis, getContractAddress, getContractInterface } from './internal/index';
|
|
10
10
|
import { sendAsync } from './ethereum/sendAsync';
|
|
11
11
|
import { parseCypher } from "./util/parse-cipher";
|
|
12
12
|
import { stringifyCypher } from "./util/stringify-cipher";
|
|
@@ -26,6 +26,7 @@ function generateAPI() {
|
|
|
26
26
|
internal: {
|
|
27
27
|
abis: abis,
|
|
28
28
|
getContractAddress,
|
|
29
|
+
getContractInterface
|
|
29
30
|
},
|
|
30
31
|
exchange: {
|
|
31
32
|
completeRelationship,
|
package/dist/api/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAU,kBAAkB,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AACzC,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,EAAE,IAAI,EAAU,kBAAkB,EAAE,oBAAoB,EAAC,MAAM,kBAAkB,CAAC;AAEzF,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAA;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AACxD,OAAO,kBAAkB,MAAM,8BAA8B,CAAC;AAE9D,SAAS,WAAW;IAChB,OAAO;QACH,MAAM,EAAE;YACJ,kBAAkB;YAClB,mBAAmB;YACnB,oBAAoB;SACvB;QACD,QAAQ,EAAE;YACN,IAAI,EAAE,IAAI;YACV,kBAAkB;YAClB,oBAAoB;SACvB;QACD,QAAQ,EAAE;YACN,oBAAoB;YACpB,UAAU;YACV,qBAAqB;SACxB;QACD,OAAO,EAAE;YACL,eAAe,EAAE,GAAG,EAAE,GAAE,CAAC;YACzB,eAAe,EAAE,GAAG,EAAE,GAAE,CAAC;YACzB,gBAAgB,EAAE,GAAG,EAAE,GAAE,CAAC;YAC1B,oBAAoB,EAAE,GAAG,EAAE,GAAE,CAAC;YAC9B,aAAa,EAAE,GAAG,EAAE,GAAE,CAAC;YACvB,UAAU,EAAE,GAAG,EAAE,GAAE,CAAC;SACvB;QACD,QAAQ,EAAE;YACN,eAAe;SAClB;QACD,OAAO,EAAE;YACL,YAAY;SACf;QACD,OAAO,EAAE;YACL,IAAI,EAAE;gBACF,gBAAgB,EAAE,oBAAoB;gBACtC,WAAW;gBACX,QAAQ;gBACR,mBAAmB;gBACnB,kBAAkB;aACrB;SACJ;QACD,QAAQ,EAAE;YACN,SAAS;YACT,OAAO;YACP,OAAO;SACV;QACD,IAAI,EAAE;YACF,WAAW;YACX,eAAe;SAClB;KACJ,CAAA;AACL,CAAC;AAED,MAAM,cAAc,GAAG,WAAW,EAAE,CAAC;AAErC,eAAe,cAAc,CAAC"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import
|
|
1
|
+
import abiMap from '../../blockchain/abi.json';
|
|
2
|
+
function getContractInterface(contract) {
|
|
3
|
+
console.log(abiMap);
|
|
4
|
+
return abiMap[contract];
|
|
5
|
+
}
|
|
6
|
+
export { getContractInterface };
|
|
2
7
|
export default {
|
|
3
8
|
'MarketFactory': abiMap['MarketFactory'],
|
|
4
9
|
'WorkRelationship': abiMap['WorkRelationship'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"abis.js","sourceRoot":"","sources":["../../../src/api/internal/abis.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"abis.js","sourceRoot":"","sources":["../../../src/api/internal/abis.ts"],"names":[],"mappings":"AACA,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAE/C,SAAS,oBAAoB,CAAC,QAAgB;IAC1C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAA;AAC3B,CAAC;AAED,OAAO,EAAE,oBAAoB,EAAE,CAAA;AAE/B,eAAe;IACX,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC;IACxC,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAC9C,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC1B,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,CAAC;IAC9C,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC;IAC5B,eAAe,EAAE,MAAM,CAAC,eAAe,CAAC;CAC3C,CAAA"}
|
|
@@ -1,8 +1,5 @@
|
|
|
1
1
|
import addressMap from '../../blockchain/addresses.json';
|
|
2
2
|
export default function getContractAddress(network, contractName) {
|
|
3
|
-
console.log(network);
|
|
4
|
-
console.log(contractName);
|
|
5
|
-
console.log(addressMap);
|
|
6
3
|
return addressMap[network][contractName];
|
|
7
4
|
}
|
|
8
5
|
//# sourceMappingURL=addresses.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,iCAAiC,CAAC;AAIzD,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,OAAqB,EAAE,YAAuB;IACrF,OAAO,
|
|
1
|
+
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"AACA,OAAO,UAAU,MAAM,iCAAiC,CAAC;AAIzD,MAAM,CAAC,OAAO,UAAU,kBAAkB,CAAC,OAAqB,EAAE,YAAuB;IACrF,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,CAAA;AAC5C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import abis from "./abis";
|
|
1
|
+
import abis, { getContractInterface } from "./abis";
|
|
2
2
|
import getContractAddress from "./addresses";
|
|
3
3
|
import events from "./events";
|
|
4
|
-
export { abis, getContractAddress, events };
|
|
4
|
+
export { abis, getContractAddress, getContractInterface, events };
|
|
5
5
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/internal/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/internal/index.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,EAAE,EAAE,oBAAoB,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,kBAAkB,MAAM,aAAa,CAAC;AAC7C,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,EAAE,IAAI,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,EAAC,CAAC"}
|
|
@@ -30,7 +30,7 @@ function processLogEvents(log) {
|
|
|
30
30
|
console.log(abiMap);
|
|
31
31
|
const { data, topics } = log;
|
|
32
32
|
for (var i = 0; i < ABI_LIST.length; i++) {
|
|
33
|
-
var abis = abiMap[
|
|
33
|
+
var abis = abiMap[ABI_LIST[i].toString()];
|
|
34
34
|
console.log(ABI_LIST[i].toString());
|
|
35
35
|
console.log('abis');
|
|
36
36
|
console.log(abis);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-log.js","sourceRoot":"","sources":["../../../src/sync/process/process-log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA2B,MAAM,iBAAiB,CAAC;AACpE,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAQ,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE;;;;;;;;;;;;;;GAcG;AACH,SAAS,UAAU,CAAC,GAAG;IACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAG;IACzB,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACnB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,IAAI,GAAG,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"process-log.js","sourceRoot":"","sources":["../../../src/sync/process/process-log.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Contracts, MarketEvents } from '../../constants';
|
|
2
|
-
import
|
|
2
|
+
import abiMap from '../../blockchain/abi.json';
|
|
3
3
|
import { ethers } from 'ethers';
|
|
4
4
|
import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
|
|
5
5
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processMarketCreatedLog.js","sourceRoot":"","sources":["../../../src/sync/process/processMarketCreatedLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,
|
|
1
|
+
{"version":3,"file":"processMarketCreatedLog.js","sourceRoot":"","sources":["../../../src/sync/process/processMarketCreatedLog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAI/C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAE3E;;;;GAIG;AACH,SAAS,yBAAyB,CAAC,GAAG;IAClC,MAAM,KAAK,GAAe,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;IACvF,MAAM,UAAU,GAAoB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACxD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;IAEvC,MAAM,aAAa,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC5B,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAC3B,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IAE3B,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,SAAS,GAAG,cAAc;UACpD,kBAAkB,GAAG,aAAa,GAAG,WAAW;UAChD,WAAW,GAAG,WAAW,GAAG,WAAW,EAAE,iBAAiB,GAAG,UAAU,EAAE,CAAE,qBAAqB,GAAG,UAAU,CAAC,CAAC;IAEjH,IAAI,UAAU,GAAG;QACb,aAAa;QACb,WAAW;QACX,WAAW;QACX,UAAU;QACV,UAAU;QACV,sBAAsB,EAAE,EAAE;KAC7B,CAAA;IAED,uBAAuB,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;AACzE,CAAC;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -13,6 +13,7 @@ import opportunityStorageProvider from "./modules/storage/OpportunityStorageProv
|
|
|
13
13
|
import { EthNetworkID } from "dvote-js";
|
|
14
14
|
import Web3 from 'web3';
|
|
15
15
|
import OpportunityStorageProvider from "./modules/storage/OpportunityStorageProvider";
|
|
16
|
+
import { createAlchemyWeb3 } from "@alch/alchemy-web3"
|
|
16
17
|
|
|
17
18
|
import { Shh } from 'web3-shh'
|
|
18
19
|
|
|
@@ -20,6 +21,7 @@ class OpportunityService {
|
|
|
20
21
|
private eventEmitter = opportunityEventEmitter;
|
|
21
22
|
private running: boolean = false;
|
|
22
23
|
private syncing: boolean = false;
|
|
24
|
+
private opportunityProvider : providers.JsonRpcProvider;
|
|
23
25
|
private ethersProvider : providers.JsonRpcProvider = ethers.getDefaultProvider('http://localhost:8545');
|
|
24
26
|
private ethersSigner : providers.JsonRpcSigner = null;
|
|
25
27
|
private static defaultProvider = new Web3('http://localhost:8545')
|
|
@@ -39,7 +41,10 @@ class OpportunityService {
|
|
|
39
41
|
* construction calls with the `new` operator.
|
|
40
42
|
*/
|
|
41
43
|
private constructor() {
|
|
44
|
+
const web3 = createAlchemyWeb3(process.env.NODE_ENV == 'dev' ? "https://eth-mainnet.alchemyapi.io/v2/JKVeBInuvm4wq9_8fECUmazLbm7Vpv5V" : "https://eth-mainnet.alchemyapi.io/v2/7d2CRio84usjQwU8tRPG75rqV1wJmX_W");
|
|
42
45
|
this.ethNetwork = 'rinkeby'
|
|
46
|
+
|
|
47
|
+
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")
|
|
43
48
|
}
|
|
44
49
|
|
|
45
50
|
/**
|
|
@@ -145,6 +150,10 @@ class OpportunityService {
|
|
|
145
150
|
}
|
|
146
151
|
|
|
147
152
|
getProviderInterface() : providers.JsonRpcProvider {
|
|
153
|
+
if (this.opportunityProvider) {
|
|
154
|
+
return this.opportunityProvider
|
|
155
|
+
}
|
|
156
|
+
|
|
148
157
|
return this.ethersProvider;
|
|
149
158
|
}
|
|
150
159
|
|
package/src/api/index.ts
CHANGED
|
@@ -7,7 +7,7 @@ import { enterWorkRelationship } from "./exchange/enter-work-relationship";
|
|
|
7
7
|
import registerNewUser from "./identity/register-new-user";
|
|
8
8
|
import { createMarket } from "./market/create-market";
|
|
9
9
|
|
|
10
|
-
import { abis, events, getContractAddress} from './internal/index';
|
|
10
|
+
import { abis, events, getContractAddress, getContractInterface} from './internal/index';
|
|
11
11
|
|
|
12
12
|
import { sendAsync } from './ethereum/sendAsync'
|
|
13
13
|
import { parseCypher } from "./util/parse-cipher";
|
|
@@ -29,6 +29,7 @@ function generateAPI() {
|
|
|
29
29
|
internal: {
|
|
30
30
|
abis: abis,
|
|
31
31
|
getContractAddress,
|
|
32
|
+
getContractInterface
|
|
32
33
|
},
|
|
33
34
|
exchange: {
|
|
34
35
|
completeRelationship,
|
package/src/api/internal/abis.ts
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
|
|
2
|
-
import
|
|
2
|
+
import abiMap from '../../blockchain/abi.json';
|
|
3
|
+
|
|
4
|
+
function getContractInterface(contract: string) {
|
|
5
|
+
console.log(abiMap)
|
|
6
|
+
return abiMap[contract]
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export { getContractInterface }
|
|
3
10
|
|
|
4
11
|
export default {
|
|
5
12
|
'MarketFactory': abiMap['MarketFactory'],
|
|
@@ -4,8 +4,5 @@ import { EthNetworkID } from 'dvote-js';
|
|
|
4
4
|
import { Contracts } from '../../constants';
|
|
5
5
|
|
|
6
6
|
export default function getContractAddress(network: EthNetworkID, contractName: Contracts): string {
|
|
7
|
-
console.log(network)
|
|
8
|
-
console.log(contractName)
|
|
9
|
-
console.log(addressMap)
|
|
10
7
|
return addressMap[network][contractName]
|
|
11
8
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import abis from "./abis";
|
|
1
|
+
import abis, { getContractInterface } from "./abis";
|
|
2
2
|
import getContractAddress from "./addresses";
|
|
3
3
|
import events from "./events";
|
|
4
4
|
|
|
5
|
-
export { abis, getContractAddress, events};
|
|
5
|
+
export { abis, getContractAddress, getContractInterface, events};
|
|
@@ -34,7 +34,7 @@ function processLogEvents(log) {
|
|
|
34
34
|
console.log(abiMap)
|
|
35
35
|
const { data, topics } = log;
|
|
36
36
|
for (var i = 0; i < ABI_LIST.length; i++) {
|
|
37
|
-
var abis = abiMap[
|
|
37
|
+
var abis = abiMap[ABI_LIST[i].toString()];
|
|
38
38
|
console.log(ABI_LIST[i].toString())
|
|
39
39
|
console.log('abis')
|
|
40
40
|
console.log(abis)
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Contracts, MarketEvents } from '../../constants';
|
|
2
|
-
import
|
|
2
|
+
import abiMap from '../../blockchain/abi.json';
|
|
3
3
|
import * as addressMap from '../../blockchain/addresses.json';
|
|
4
4
|
import opportunityService from '../../OpportunityService';
|
|
5
5
|
import { Contract } from '@ethersproject/contracts';
|