opportunity-service 0.0.522 → 0.0.526
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/OpportunityService.js +4 -4
- package/dist/api/exchange/create-dispute.js +1 -1
- package/dist/api/exchange/create-task.js +1 -1
- package/dist/api/identity/register-new-user.js +1 -1
- package/dist/api/internal/addresses.js +13 -5
- package/dist/api/internal/addresses.js.map +1 -1
- package/dist/blockchain/addresses.json +4 -2
- package/dist/sync/sync-markets.js +1 -1
- package/package.json +1 -1
- package/src/OpportunityService.ts +4 -4
- package/src/api/exchange/create-dispute.ts +1 -1
- package/src/api/exchange/create-task.ts +1 -1
- package/src/api/identity/register-new-user.ts +1 -1
- package/src/api/internal/addresses.ts +14 -5
- package/src/blockchain/addresses.json +4 -2
- package/src/sync/sync-markets.ts +1 -1
- package/test/voting.test.ts +1 -1
@@ -30,9 +30,9 @@ class OpportunityService {
|
|
30
30
|
this.opportunityLogger = null;
|
31
31
|
this.storageProvider = opportunityStorageProvider;
|
32
32
|
this.currentAccount = null;
|
33
|
-
this.ethNetwork = '
|
33
|
+
this.ethNetwork = 'mainnet';
|
34
34
|
this.api = opportunityAPI;
|
35
|
-
this.ethNetwork = '
|
35
|
+
this.ethNetwork = 'mainnet';
|
36
36
|
}
|
37
37
|
/**
|
38
38
|
* The static method that controls the access to the singleton instance.
|
@@ -67,10 +67,10 @@ class OpportunityService {
|
|
67
67
|
this.ethNetwork = 'mainnet';
|
68
68
|
break;
|
69
69
|
case 4:
|
70
|
-
this.ethNetwork = '
|
70
|
+
this.ethNetwork = 'mainnet';
|
71
71
|
break;
|
72
72
|
default:
|
73
|
-
this.ethNetwork = '
|
73
|
+
this.ethNetwork = 'mainnet';
|
74
74
|
}
|
75
75
|
}
|
76
76
|
getEthNetwork() {
|
@@ -28,7 +28,7 @@ function createDispute(data) {
|
|
28
28
|
// The factory we use for deploying contracts
|
29
29
|
const disputeContractfactory = new ContractFactory(abi, bytecodeMap[Contracts.DISPUTE], opportunityService.getSignersInterface());
|
30
30
|
// Deploy an instance of the contract
|
31
|
-
const disputeContract = yield disputeContractfactory.deploy(relationshipAddress, addressMap['
|
31
|
+
const disputeContract = yield disputeContractfactory.deploy(relationshipAddress, addressMap['mainnet'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
|
32
32
|
const txReceipt = yield disputeContract.deployTransaction.wait();
|
33
33
|
console.log(txReceipt);
|
34
34
|
}
|
@@ -38,7 +38,7 @@ function createTask(data) {
|
|
38
38
|
console.log('d');
|
39
39
|
const contract = yield new ethers.Contract(taskMarket, abi).connect(opportunityService.getSignersInterface());
|
40
40
|
console.log('e');
|
41
|
-
const txResponse = yield contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['
|
41
|
+
const txResponse = yield contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['mainnet']['Dai']);
|
42
42
|
const txReceipt = yield txResponse.wait();
|
43
43
|
console.log(txReceipt);
|
44
44
|
}
|
@@ -14,7 +14,7 @@ import * as addressMap from '../../blockchain/addresses.json';
|
|
14
14
|
import * as abiMap from '../../blockchain/abi.json';
|
15
15
|
function registerNewUser(universalAddress) {
|
16
16
|
return __awaiter(this, void 0, void 0, function* () {
|
17
|
-
const txResult = new Contract(addressMap['
|
17
|
+
const txResult = new Contract(addressMap['mainnet'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
|
18
18
|
.connect(opportunityService.getSignersInterface())
|
19
19
|
.functions
|
20
20
|
.registerNewUser(universalAddress)
|
@@ -1,11 +1,19 @@
|
|
1
1
|
import * as addresses from '../../blockchain/addresses.json';
|
2
|
-
const ethNetwork = '
|
2
|
+
const ethNetwork = 'mainnet'; //'mainnet'
|
3
3
|
const addressMapToString = JSON.stringify(addresses);
|
4
4
|
const addressMap = JSON.parse(addressMapToString);
|
5
|
+
const dig = (obj, target) => target in obj ?
|
6
|
+
obj[target] :
|
7
|
+
Object.values(obj).reduce((acc, val) => {
|
8
|
+
if (acc !== undefined)
|
9
|
+
return acc;
|
10
|
+
if (typeof val === 'object')
|
11
|
+
return dig(val, target);
|
12
|
+
}, undefined);
|
5
13
|
export default {
|
6
|
-
'MarketFactory': addressMap
|
7
|
-
'UserRegistration': addressMap
|
8
|
-
'Dai': addressMap
|
9
|
-
'Scheduler': addressMap
|
14
|
+
'MarketFactory': dig(addressMap, 'MarketFactory'),
|
15
|
+
'UserRegistration': dig(addressMap, 'UserRegistration'),
|
16
|
+
'Dai': dig(addressMap, 'Dai'),
|
17
|
+
'Scheduler': dig(addressMap, 'Scheduler')
|
10
18
|
};
|
11
19
|
//# sourceMappingURL=addresses.js.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,iCAAiC,CAAC;AAE7D,MAAM,UAAU,GAAG,SAAS,CAAA,CAAC,WAAW;AACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;AAEjD,
|
1
|
+
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../src/api/internal/addresses.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,SAAS,MAAM,iCAAiC,CAAC;AAE7D,MAAM,UAAU,GAAG,SAAS,CAAA,CAAC,WAAW;AACxC,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;AACpD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;AAEjD,MAAM,GAAG,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CACzB,MAAM,IAAI,GAAG,CAAC,CAAC;IACf,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACb,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACpC,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,GAAG,CAAC;QAClC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxD,CAAC,EAAE,SAAS,CAAC,CAAC;AAGjB,eAAe;IACX,eAAe,EAAE,GAAG,CAAC,UAAU,EAAE,eAAe,CAAC;IACjD,kBAAkB,EAAE,GAAG,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACvD,KAAK,EAAE,GAAG,CAAC,UAAU,EAAE,KAAK,CAAC;IAC7B,WAAW,EAAE,GAAG,CAAC,UAAU,EAAE,WAAW,CAAC;CAC5C,CAAA"}
|
@@ -1,13 +1,15 @@
|
|
1
1
|
{
|
2
2
|
"rinkeby": {
|
3
|
-
"MarketFactory": "
|
4
|
-
"UserRegistration": "
|
3
|
+
"MarketFactory": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
|
4
|
+
"UserRegistration": "0x520d8C14A349E0fB2aec3726880595A0a780b5BD",
|
5
|
+
"UserSummaryFactory": "0xA81d698B0F165E4833239a75300a2cA0DCC8F72d",
|
5
6
|
"Dai": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
|
6
7
|
"Scheduler": "0x"
|
7
8
|
},
|
8
9
|
"mainnet": {
|
9
10
|
"MarketFactory": "0x8eb065482F681537e90eab826540E9DF8D8cBd89",
|
10
11
|
"UserRegistration": "0xc4F1B570e57A5035a25035AFA5f7CbA204627024",
|
12
|
+
"UserSummaryFactory": "",
|
11
13
|
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
|
12
14
|
"Scheduler": "0x"
|
13
15
|
}
|
@@ -15,7 +15,7 @@ function syncMarkets() {
|
|
15
15
|
return __awaiter(this, void 0, void 0, function* () {
|
16
16
|
//sync Markets
|
17
17
|
yield opportunityService.getProviderInterface().getLogs({
|
18
|
-
address: addressMap['
|
18
|
+
address: addressMap['mainnet'][Contracts.MARKET_FACTORY],
|
19
19
|
fromBlock: 1,
|
20
20
|
toBlock: 'latest'
|
21
21
|
}).then((logs) => {
|
package/package.json
CHANGED
@@ -23,7 +23,7 @@ class OpportunityService {
|
|
23
23
|
private opportunityLogger = null;
|
24
24
|
private storageProvider = opportunityStorageProvider;
|
25
25
|
private currentAccount = null;
|
26
|
-
private ethNetwork : string = '
|
26
|
+
private ethNetwork : string = 'mainnet'
|
27
27
|
public api = opportunityAPI;
|
28
28
|
|
29
29
|
private static instance: OpportunityService;
|
@@ -33,7 +33,7 @@ class OpportunityService {
|
|
33
33
|
* construction calls with the `new` operator.
|
34
34
|
*/
|
35
35
|
private constructor() {
|
36
|
-
this.ethNetwork = '
|
36
|
+
this.ethNetwork = 'mainnet'
|
37
37
|
}
|
38
38
|
|
39
39
|
/**
|
@@ -76,10 +76,10 @@ class OpportunityService {
|
|
76
76
|
this.ethNetwork = 'mainnet'
|
77
77
|
break
|
78
78
|
case 4:
|
79
|
-
this.ethNetwork = '
|
79
|
+
this.ethNetwork = 'mainnet'
|
80
80
|
break
|
81
81
|
default:
|
82
|
-
this.ethNetwork = '
|
82
|
+
this.ethNetwork = 'mainnet'
|
83
83
|
}
|
84
84
|
}
|
85
85
|
|
@@ -31,7 +31,7 @@ async function createDispute(data) : Promise<void> {
|
|
31
31
|
const disputeContractfactory = new ContractFactory(abi, bytecodeMap[Contracts.DISPUTE], opportunityService.getSignersInterface())
|
32
32
|
|
33
33
|
// Deploy an instance of the contract
|
34
|
-
const disputeContract = await disputeContractfactory.deploy(relationshipAddress, addressMap['
|
34
|
+
const disputeContract = await disputeContractfactory.deploy(relationshipAddress, addressMap['mainnet'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
|
35
35
|
const txReceipt = await disputeContract.deployTransaction.wait()
|
36
36
|
console.log(txReceipt)
|
37
37
|
} catch(error) {
|
@@ -40,7 +40,7 @@ async function createTask(data) : Promise<void> {
|
|
40
40
|
console.log('d')
|
41
41
|
const contract = await new ethers.Contract(taskMarket, abi).connect(opportunityService.getSignersInterface());
|
42
42
|
console.log('e')
|
43
|
-
const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['
|
43
|
+
const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, addressMap['mainnet']['Dai'])
|
44
44
|
const txReceipt = await txResponse.wait()
|
45
45
|
console.log(txReceipt)
|
46
46
|
} catch(error) {
|
@@ -7,7 +7,7 @@ import * as abiMap from '../../blockchain/abi.json';
|
|
7
7
|
import { Result } from 'ethers/lib/utils';
|
8
8
|
|
9
9
|
async function registerNewUser(universalAddress) {
|
10
|
-
const txResult = new Contract(addressMap['
|
10
|
+
const txResult = new Contract(addressMap['mainnet'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
|
11
11
|
.connect(opportunityService.getSignersInterface())
|
12
12
|
.functions
|
13
13
|
.registerNewUser(universalAddress)
|
@@ -1,13 +1,22 @@
|
|
1
1
|
import opportunityService from '../../OpportunityService';
|
2
2
|
import * as addresses from '../../blockchain/addresses.json';
|
3
3
|
|
4
|
-
const ethNetwork = '
|
4
|
+
const ethNetwork = 'mainnet' //'mainnet'
|
5
5
|
const addressMapToString = JSON.stringify(addresses)
|
6
6
|
const addressMap = JSON.parse(addressMapToString)
|
7
7
|
|
8
|
+
const dig = (obj, target) =>
|
9
|
+
target in obj ?
|
10
|
+
obj[target] :
|
11
|
+
Object.values(obj).reduce((acc, val) => {
|
12
|
+
if (acc !== undefined) return acc;
|
13
|
+
if (typeof val === 'object') return dig(val, target);
|
14
|
+
}, undefined);
|
15
|
+
|
16
|
+
|
8
17
|
export default {
|
9
|
-
'MarketFactory': addressMap
|
10
|
-
'UserRegistration': addressMap
|
11
|
-
'Dai': addressMap
|
12
|
-
'Scheduler': addressMap
|
18
|
+
'MarketFactory': dig(addressMap, 'MarketFactory'),
|
19
|
+
'UserRegistration': dig(addressMap, 'UserRegistration'),
|
20
|
+
'Dai': dig(addressMap, 'Dai'),
|
21
|
+
'Scheduler': dig(addressMap, 'Scheduler')
|
13
22
|
}
|
@@ -1,13 +1,15 @@
|
|
1
1
|
{
|
2
2
|
"rinkeby": {
|
3
|
-
"MarketFactory": "
|
4
|
-
"UserRegistration": "
|
3
|
+
"MarketFactory": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
|
4
|
+
"UserRegistration": "0x520d8C14A349E0fB2aec3726880595A0a780b5BD",
|
5
|
+
"UserSummaryFactory": "0xA81d698B0F165E4833239a75300a2cA0DCC8F72d",
|
5
6
|
"Dai": "0xD5942d62e7c57690F1B89A672ACa0E6F20aAD247",
|
6
7
|
"Scheduler": "0x"
|
7
8
|
},
|
8
9
|
"mainnet": {
|
9
10
|
"MarketFactory": "0x8eb065482F681537e90eab826540E9DF8D8cBd89",
|
10
11
|
"UserRegistration": "0xc4F1B570e57A5035a25035AFA5f7CbA204627024",
|
12
|
+
"UserSummaryFactory": "",
|
11
13
|
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
|
12
14
|
"Scheduler": "0x"
|
13
15
|
}
|
package/src/sync/sync-markets.ts
CHANGED
@@ -6,7 +6,7 @@ import { processLog } from './process/process-log';
|
|
6
6
|
async function syncMarkets() {
|
7
7
|
//sync Markets
|
8
8
|
await opportunityService.getProviderInterface().getLogs({
|
9
|
-
address: addressMap['
|
9
|
+
address: addressMap['mainnet'][Contracts.MARKET_FACTORY],
|
10
10
|
fromBlock: 1,
|
11
11
|
toBlock: 'latest'
|
12
12
|
}).then((logs) => {
|
package/test/voting.test.ts
CHANGED
@@ -4,7 +4,7 @@ import { ethers } from "dvote-js/node_modules/ethers"
|
|
4
4
|
import gwPool, { connectGateways } from "../src/api/voting/connect"
|
5
5
|
import { registerEntity } from '../src/api/voting/entity'
|
6
6
|
|
7
|
-
const ethNetworkId = '
|
7
|
+
const ethNetworkId = 'mainnet'
|
8
8
|
const environment = 'dev'
|
9
9
|
const bootnodesContentUri = "https://bootnodes.vocdoni.net/gateways.dev.json"
|
10
10
|
|