opportunity-service 0.0.609 → 0.0.613
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -48,8 +48,13 @@ class OpportunityService {
|
|
|
48
48
|
return OpportunityService.instance;
|
|
49
49
|
}
|
|
50
50
|
assignDefaultProvider(provider) {
|
|
51
|
-
|
|
52
|
-
|
|
51
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
52
|
+
OpportunityService.defaultProvider = provider;
|
|
53
|
+
const shhProvider = provider;
|
|
54
|
+
shhProvider.setProvider(new Web3.providers.WebsocketProvider("ws://localhost:8546", { headers: { Origin: "mychat" } }));
|
|
55
|
+
yield shhProvider.eth.net.isListening();
|
|
56
|
+
this.whisperProvider = new WhisperHandler(shhProvider);
|
|
57
|
+
});
|
|
53
58
|
}
|
|
54
59
|
assignProvider(provider) {
|
|
55
60
|
this.ethersProvider = provider;
|
|
@@ -64,7 +69,7 @@ class OpportunityService {
|
|
|
64
69
|
startEventListeners(eventDictionary, onComplete);
|
|
65
70
|
}
|
|
66
71
|
setNetworkParameters(networkId, dbAddress) {
|
|
67
|
-
switch (networkId) {
|
|
72
|
+
switch (parseInt(networkId, 10)) {
|
|
68
73
|
case 1:
|
|
69
74
|
this.ethNetwork = 'mainnet';
|
|
70
75
|
break;
|
|
@@ -74,6 +79,7 @@ class OpportunityService {
|
|
|
74
79
|
default:
|
|
75
80
|
this.ethNetwork = 'rinkeby';
|
|
76
81
|
}
|
|
82
|
+
console.log(networkId);
|
|
77
83
|
//this.storageProvider = new OpportunityStorageProvider(dbAddress)
|
|
78
84
|
}
|
|
79
85
|
getEthNetwork() {
|
|
@@ -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;AAGxB,OAAO,cAAc,MAAM,+BAA+B,CAAC;AAE3D,MAAM,kBAAkB;IAkBpB;;;OAGG;IACH;QArBQ,iBAAY,GAAG,uBAAuB,CAAC;QACvC,YAAO,GAAY,KAAK,CAAC;QACzB,YAAO,GAAY,KAAK,CAAC;QACzB,mBAAc,GAA+B,MAAM,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,CAAC;QAChG,iBAAY,GAA6B,IAAI,CAAC;QAE9C,sBAAiB,GAAG,IAAI,CAAC;QACzB,oBAAe,GAAG,IAAI,CAAC;QACvB,mBAAc,GAAG,IAAI,CAAC;QACtB,eAAU,GAA2B,SAAS,CAAA;QAC9C,oBAAe,GAAG,IAAI,CAAC;QACxB,YAAO,GAAG,IAAI,CAAA;QAId,QAAG,GAAI,cAAc,CAAC;QAOzB,IAAI,CAAC,UAAU,GAAG,SAAS,CAAA;IAC/B,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,WAAW;QACrB,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE;YAC9B,kBAAkB,CAAC,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;SAC1D;QAED,OAAO,kBAAkB,CAAC,QAAQ,CAAC;IACvC,CAAC;
|
|
1
|
+
{"version":3,"file":"OpportunityService.js","sourceRoot":"","sources":["../src/OpportunityService.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,11 @@
|
|
|
7
7
|
"Participation": "0xC9dbEA7aeBd89acA4d138Df139E04c30Ea0FF47f"
|
|
8
8
|
},
|
|
9
9
|
"mainnet": {
|
|
10
|
-
"MarketFactory": "
|
|
11
|
-
"UserRegistration": "
|
|
12
|
-
"UserSummaryFactory": "",
|
|
10
|
+
"MarketFactory": "0x1da7170783ff0EbeCBf5497A195D4b8c3a2717b9",
|
|
11
|
+
"UserRegistration": "0x3755AfF65C5FB6C4f58863B09C685bA8B782d36a",
|
|
12
|
+
"UserSummaryFactory": "0xA5C56C73bF223A928fB7DF7026cC4A16288AC88a",
|
|
13
13
|
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
|
|
14
|
-
"Participation": "
|
|
14
|
+
"Participation": "0x2bC16f94570b51AE50cfcAAFFCB0Ef64FCDC94F4"
|
|
15
15
|
},
|
|
16
16
|
"xdai": {}
|
|
17
17
|
}
|
package/package.json
CHANGED
|
@@ -56,9 +56,13 @@ class OpportunityService {
|
|
|
56
56
|
return OpportunityService.instance;
|
|
57
57
|
}
|
|
58
58
|
|
|
59
|
-
assignDefaultProvider(provider : Web3) {
|
|
59
|
+
async assignDefaultProvider(provider : Web3) {
|
|
60
60
|
OpportunityService.defaultProvider = provider;
|
|
61
|
-
|
|
61
|
+
const shhProvider = provider;
|
|
62
|
+
shhProvider.setProvider(new Web3.providers.WebsocketProvider("ws://localhost:8546", {headers: {Origin: "mychat"}}));
|
|
63
|
+
await shhProvider.eth.net.isListening();
|
|
64
|
+
|
|
65
|
+
this.whisperProvider = new WhisperHandler(shhProvider);
|
|
62
66
|
}
|
|
63
67
|
|
|
64
68
|
assignProvider(provider : any) {
|
|
@@ -77,8 +81,8 @@ class OpportunityService {
|
|
|
77
81
|
startEventListeners(eventDictionary, onComplete);
|
|
78
82
|
}
|
|
79
83
|
|
|
80
|
-
setNetworkParameters(networkId:
|
|
81
|
-
switch(networkId) {
|
|
84
|
+
setNetworkParameters(networkId: string, dbAddress: string) {
|
|
85
|
+
switch(parseInt(networkId, 10)) {
|
|
82
86
|
case 1:
|
|
83
87
|
this.ethNetwork = 'mainnet'
|
|
84
88
|
break
|
|
@@ -89,6 +93,8 @@ class OpportunityService {
|
|
|
89
93
|
this.ethNetwork = 'rinkeby'
|
|
90
94
|
}
|
|
91
95
|
|
|
96
|
+
console.log(networkId)
|
|
97
|
+
|
|
92
98
|
//this.storageProvider = new OpportunityStorageProvider(dbAddress)
|
|
93
99
|
}
|
|
94
100
|
|
|
@@ -7,11 +7,11 @@
|
|
|
7
7
|
"Participation": "0xC9dbEA7aeBd89acA4d138Df139E04c30Ea0FF47f"
|
|
8
8
|
},
|
|
9
9
|
"mainnet": {
|
|
10
|
-
"MarketFactory": "
|
|
11
|
-
"UserRegistration": "
|
|
12
|
-
"UserSummaryFactory": "",
|
|
10
|
+
"MarketFactory": "0x1da7170783ff0EbeCBf5497A195D4b8c3a2717b9",
|
|
11
|
+
"UserRegistration": "0x3755AfF65C5FB6C4f58863B09C685bA8B782d36a",
|
|
12
|
+
"UserSummaryFactory": "0xA5C56C73bF223A928fB7DF7026cC4A16288AC88a",
|
|
13
13
|
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
|
|
14
|
-
"Participation": "
|
|
14
|
+
"Participation": "0x2bC16f94570b51AE50cfcAAFFCB0Ef64FCDC94F4"
|
|
15
15
|
},
|
|
16
16
|
"xdai": {
|
|
17
17
|
|