opportunity-service 0.0.539 → 0.0.544
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/api/internal/addresses.js +17 -23
- package/dist/api/internal/addresses.js.map +1 -1
- package/dist/blockchain/addresses.json +4 -4
- package/dist/sync/sync-jobs.js +17 -15
- package/dist/sync/sync-jobs.js.map +1 -1
- package/dist/sync/sync-markets.js +17 -15
- package/dist/sync/sync-markets.js.map +1 -1
- package/package.json +1 -1
- package/src/api/internal/addresses.ts +7 -23
- package/src/blockchain/addresses.json +4 -4
- package/src/sync/sync-jobs.ts +2 -0
- package/src/sync/sync-markets.ts +2 -0
@@ -1,25 +1,19 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
},
|
10
|
-
"mainnet": {
|
11
|
-
'MarketFactory': addressMap['mainnet']['MarketFactory'],
|
12
|
-
'UserRegistration': addressMap['mainnet']['UserRegistration'],
|
13
|
-
'UserSummaryFactory': addressMap['mainnet']['UserSummaryFactory'],
|
14
|
-
'Dai': addressMap['mainnet']['Dai'],
|
15
|
-
'Participation': addressMap['mainnet']['Participation']
|
16
|
-
},
|
17
|
-
"xdai": {
|
18
|
-
'MarketFactory': addressMap['xdai']['MarketFactory'],
|
19
|
-
'UserRegistration': addressMap['xdai']['UserRegistration'],
|
20
|
-
'UserSummaryFactory': addressMap['xdai']['UserSummaryFactory'],
|
21
|
-
'Dai': addressMap['xdai']['Dai'],
|
22
|
-
'Participation': addressMap['xdai']['Participation']
|
23
|
-
}
|
1
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
2
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
3
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
4
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
5
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
6
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
7
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
|
+
});
|
24
9
|
};
|
10
|
+
import opportunityService from '../../OpportunityService';
|
11
|
+
import * as addressMap from '../../blockchain/addresses.json';
|
12
|
+
function getAddressMap() {
|
13
|
+
return __awaiter(this, void 0, void 0, function* () {
|
14
|
+
const network = yield opportunityService.getEthNetwork();
|
15
|
+
return addressMap[network];
|
16
|
+
});
|
17
|
+
}
|
18
|
+
export default getAddressMap();
|
25
19
|
//# sourceMappingURL=addresses.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAG9D,SAAe,aAAa;;QACxB,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,aAAa,EAAE,CAAA;QACxD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAA;IAC9B,CAAC;CAAA;AAED,eAAe,aAAa,EAAE,CAAA"}
|
@@ -1,10 +1,10 @@
|
|
1
1
|
{
|
2
2
|
"rinkeby": {
|
3
|
-
"MarketFactory": "
|
4
|
-
"UserRegistration": "
|
5
|
-
"UserSummaryFactory": "
|
3
|
+
"MarketFactory": "0x72141925d0Cd8bC72Bea3A555976335341B1e7BF",
|
4
|
+
"UserRegistration": "0xb2359b2B2F4795b9AEd240d0e9606897BfEBB348",
|
5
|
+
"UserSummaryFactory": "0x95bFe6b12b89EBb87D6f2B854f2055Fc867Dbd50",
|
6
6
|
"Dai": "0x5592ec0cfb4dbc12d3ab100b257153436a1f0fea",
|
7
|
-
"Participation": "
|
7
|
+
"Participation": "0xE4c3a2698e5e4F8BE58481eB923ADA73982BD94d"
|
8
8
|
},
|
9
9
|
"mainnet": {
|
10
10
|
"MarketFactory": "0x8eb065482F681537e90eab826540E9DF8D8cBd89",
|
package/dist/sync/sync-jobs.js
CHANGED
@@ -11,22 +11,24 @@ import opportunityService from "../OpportunityService";
|
|
11
11
|
import { processLog } from './process/process-log';
|
12
12
|
function syncJobs(marketAddress) {
|
13
13
|
return __awaiter(this, void 0, void 0, function* () {
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
14
|
+
if (opportunityService.getProviderInterface()) {
|
15
|
+
//sync Jobs
|
16
|
+
yield opportunityService.getProviderInterface().getLogs({
|
17
|
+
address: marketAddress,
|
18
|
+
fromBlock: 1,
|
19
|
+
toBlock: 'latest'
|
20
|
+
}).then((logs) => {
|
21
|
+
console.log('Found logs.. Processing sync Jobs');
|
22
|
+
logs.forEach(log => {
|
23
|
+
if (log && Array.isArray(log.topics) && log.topics.length) {
|
24
|
+
processLog(log); // keccashinside here
|
25
|
+
}
|
26
|
+
});
|
27
|
+
})
|
28
|
+
.catch(err => {
|
29
|
+
console.log('Err on fetching logs from blockchain: ' + err);
|
25
30
|
});
|
26
|
-
}
|
27
|
-
.catch(err => {
|
28
|
-
console.log('Err on fetching logs from blockchain: ' + err);
|
29
|
-
});
|
31
|
+
}
|
30
32
|
});
|
31
33
|
}
|
32
34
|
export default syncJobs;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sync-jobs.js","sourceRoot":"","sources":["../../src/sync/sync-jobs.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,SAAe,QAAQ,CAAC,aAAa;;
|
1
|
+
{"version":3,"file":"sync-jobs.js","sourceRoot":"","sources":["../../src/sync/sync-jobs.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,kBAAkB,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAInD,SAAe,QAAQ,CAAC,aAAa;;QACjC,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,EAAE;YAC9C,WAAW;YACX,MAAM,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC;gBACrD,OAAO,EAAE,aAAa;gBACtB,SAAS,EAAE,CAAC;gBACZ,OAAO,EAAE,QAAQ;aACpB,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACb,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAA;gBAChD,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,QAAQ,CAAC"}
|
@@ -13,22 +13,24 @@ import { Contracts } from '../constants';
|
|
13
13
|
import { processLog } from './process/process-log';
|
14
14
|
function syncMarkets() {
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
16
|
+
if (opportunityService.getProviderInterface()) {
|
17
|
+
//sync Markets
|
18
|
+
yield opportunityService.getProviderInterface().getLogs({
|
19
|
+
address: addressMap[opportunityService.getEthNetwork()][Contracts.MARKET_FACTORY],
|
20
|
+
fromBlock: 1,
|
21
|
+
toBlock: 'latest'
|
22
|
+
}).then((logs) => {
|
23
|
+
console.log('Found logs.. Processing...');
|
24
|
+
logs.forEach(log => {
|
25
|
+
if (log && Array.isArray(log.topics) && log.topics.length) {
|
26
|
+
processLog(log); // keccashinside here
|
27
|
+
}
|
28
|
+
});
|
29
|
+
})
|
30
|
+
.catch(err => {
|
31
|
+
console.log('Err on fetching logs from blockchain: ' + err);
|
27
32
|
});
|
28
|
-
}
|
29
|
-
.catch(err => {
|
30
|
-
console.log('Err on fetching logs from blockchain: ' + err);
|
31
|
-
});
|
33
|
+
}
|
32
34
|
});
|
33
35
|
}
|
34
36
|
export default syncMarkets;
|
@@ -1 +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,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;
|
1
|
+
{"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,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,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"}
|
package/package.json
CHANGED
@@ -1,26 +1,10 @@
|
|
1
1
|
import opportunityService from '../../OpportunityService';
|
2
2
|
import * as addressMap from '../../blockchain/addresses.json';
|
3
|
+
import { EthNetworkID } from 'dvote-js';
|
3
4
|
|
4
|
-
|
5
|
-
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
'Participation': addressMap['rinkeby']['Participation']
|
11
|
-
},
|
12
|
-
"mainnet": {
|
13
|
-
'MarketFactory': addressMap['mainnet']['MarketFactory'],
|
14
|
-
'UserRegistration': addressMap['mainnet']['UserRegistration'],
|
15
|
-
'UserSummaryFactory': addressMap['mainnet']['UserSummaryFactory'],
|
16
|
-
'Dai': addressMap['mainnet']['Dai'],
|
17
|
-
'Participation': addressMap['mainnet']['Participation']
|
18
|
-
},
|
19
|
-
"xdai": {
|
20
|
-
'MarketFactory': addressMap['xdai']['MarketFactory'],
|
21
|
-
'UserRegistration': addressMap['xdai']['UserRegistration'],
|
22
|
-
'UserSummaryFactory': addressMap['xdai']['UserSummaryFactory'],
|
23
|
-
'Dai': addressMap['xdai']['Dai'],
|
24
|
-
'Participation': addressMap['xdai']['Participation']
|
25
|
-
}
|
26
|
-
}
|
5
|
+
async function getAddressMap() {
|
6
|
+
const network = await opportunityService.getEthNetwork()
|
7
|
+
return addressMap[network]
|
8
|
+
}
|
9
|
+
|
10
|
+
export default getAddressMap()
|
@@ -1,10 +1,10 @@
|
|
1
1
|
{
|
2
2
|
"rinkeby": {
|
3
|
-
"MarketFactory": "
|
4
|
-
"UserRegistration": "
|
5
|
-
"UserSummaryFactory": "
|
3
|
+
"MarketFactory": "0x72141925d0Cd8bC72Bea3A555976335341B1e7BF",
|
4
|
+
"UserRegistration": "0xb2359b2B2F4795b9AEd240d0e9606897BfEBB348",
|
5
|
+
"UserSummaryFactory": "0x95bFe6b12b89EBb87D6f2B854f2055Fc867Dbd50",
|
6
6
|
"Dai": "0x5592ec0cfb4dbc12d3ab100b257153436a1f0fea",
|
7
|
-
"Participation": "
|
7
|
+
"Participation": "0xE4c3a2698e5e4F8BE58481eB923ADA73982BD94d"
|
8
8
|
},
|
9
9
|
"mainnet": {
|
10
10
|
"MarketFactory": "0x8eb065482F681537e90eab826540E9DF8D8cBd89",
|
package/src/sync/sync-jobs.ts
CHANGED
@@ -4,6 +4,7 @@ import * as addressMap from '../blockchain/addresses.json';
|
|
4
4
|
import { Contracts } from '../constants';
|
5
5
|
|
6
6
|
async function syncJobs(marketAddress) {
|
7
|
+
if (opportunityService.getProviderInterface()) {
|
7
8
|
//sync Jobs
|
8
9
|
await opportunityService.getProviderInterface().getLogs({
|
9
10
|
address: marketAddress,
|
@@ -21,5 +22,6 @@ async function syncJobs(marketAddress) {
|
|
21
22
|
console.log('Err on fetching logs from blockchain: ' + err)
|
22
23
|
})
|
23
24
|
}
|
25
|
+
}
|
24
26
|
|
25
27
|
export default syncJobs;
|
package/src/sync/sync-markets.ts
CHANGED
@@ -4,6 +4,7 @@ import { Contracts } from '../constants';
|
|
4
4
|
import { processLog } from './process/process-log';
|
5
5
|
|
6
6
|
async function syncMarkets() {
|
7
|
+
if (opportunityService.getProviderInterface()) {
|
7
8
|
//sync Markets
|
8
9
|
await opportunityService.getProviderInterface().getLogs({
|
9
10
|
address: addressMap[opportunityService.getEthNetwork()][Contracts.MARKET_FACTORY],
|
@@ -20,6 +21,7 @@ async function syncMarkets() {
|
|
20
21
|
.catch(err => {
|
21
22
|
console.log('Err on fetching logs from blockchain: ' + err)
|
22
23
|
})
|
24
|
+
}
|
23
25
|
}
|
24
26
|
|
25
27
|
export default syncMarkets;
|