opportunity-service 0.0.520 → 0.0.524
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/api/exchange/create-dispute.js +1 -1
- package/dist/api/exchange/create-dispute.js.map +1 -1
- package/dist/api/exchange/create-task.js +1 -1
- package/dist/api/exchange/create-task.js.map +1 -1
- package/dist/api/identity/register-new-user.js +1 -1
- package/dist/api/identity/register-new-user.js.map +1 -1
- package/dist/api/internal/addresses.js +16 -6
- package/dist/api/internal/addresses.js.map +1 -1
- package/dist/blockchain/addresses.json +4 -2
- package/package.json +1 -1
- 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 +17 -6
- package/src/blockchain/addresses.json +4 -2
@@ -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['rinkeby'][Contracts.SCHEDULER], complaintMetadataPointer, complaintResponseMetadataPointer);
|
32
32
|
const txReceipt = yield disputeContract.deployTransaction.wait();
|
33
33
|
console.log(txReceipt);
|
34
34
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-dispute.js","sourceRoot":"","sources":["../../../src/api/exchange/create-dispute.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAI1D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAC7D,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAC;AAC9D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAU,eAAe,EAAE,MAAM,QAAQ,CAAC;AAIjD,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC;AAEhD,SAAe,aAAa,CAAC,IAAI;;QAC7B,kBAAkB;QAElB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACnC,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAErC,MAAM,wBAAwB,GAAG,UAAU,CAAC,0BAA0B,CAAC,CAAA;QACvE,MAAM,gCAAgC,GAAG,UAAU,CAAC,kCAAkC,CAAC,CAAA;QACvF,MAAM,mBAAmB,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;QAE7D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAEvB,IAAI;YACA,6CAA6C;YAC7C,MAAM,sBAAsB,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAA;YAEjI,qCAAqC;YACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,mBAAmB,EAAE,UAAU,CAAC,
|
1
|
+
{"version":3,"file":"create-dispute.js","sourceRoot":"","sources":["../../../src/api/exchange/create-dispute.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAgB,MAAM,iBAAiB,CAAC;AAI1D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAC7D,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAC;AAC9D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAU,eAAe,EAAE,MAAM,QAAQ,CAAC;AAIjD,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC;AAEhD,SAAe,aAAa,CAAC,IAAI;;QAC7B,kBAAkB;QAElB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QACnC,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;QAErC,MAAM,wBAAwB,GAAG,UAAU,CAAC,0BAA0B,CAAC,CAAA;QACvE,MAAM,gCAAgC,GAAG,UAAU,CAAC,kCAAkC,CAAC,CAAA;QACvF,MAAM,mBAAmB,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;QAE7D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAEvB,IAAI;YACA,6CAA6C;YAC7C,MAAM,sBAAsB,GAAG,IAAI,eAAe,CAAC,GAAG,EAAE,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAA;YAEjI,qCAAqC;YACrC,MAAM,eAAe,GAAG,MAAM,sBAAsB,CAAC,MAAM,CAAC,mBAAmB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,wBAAwB,EAAE,gCAAgC,CAAC,CAAC;YACzL,MAAM,SAAS,GAAG,MAAM,eAAe,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAA;YAChE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;SACzB;QAAC,OAAM,KAAK,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,0CAA0C,GAAG,KAAK,CAAC,CAAC;SACnE;IACL,CAAC;CAAA;AAED,OAAO,EAAE,aAAa,EAAE,CAAA"}
|
@@ -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['rinkeby']['Dai']);
|
42
42
|
const txReceipt = yield txResponse.wait();
|
43
43
|
console.log(txReceipt);
|
44
44
|
}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"create-task.js","sourceRoot":"","sources":["../../../src/api/exchange/create-task.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI1D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAE7D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC;AAEhD,SAAe,UAAU,CAAC,IAAI;;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAEvB,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC,CAAA;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAA;QACnD,MAAM,mBAAmB,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;QAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAEhC,IAAI,SAAS,IAAI,IAAI,IAAI,UAAU,IAAI,CAAC,IAAI,UAAU,IAAI,CAAC,IAAI,mBAAmB,IAAI,EAAE,EAAG;YACvF,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACxC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAC;YAC9G,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,
|
1
|
+
{"version":3,"file":"create-task.js","sourceRoot":"","sources":["../../../src/api/exchange/create-task.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI1D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AACpD,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAA;AAE7D,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC;AAEhD,SAAe,UAAU,CAAC,IAAI;;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QAEvB,MAAM,SAAS,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,UAAU,CAAC,YAAY,CAAC,CAAA;QAC3C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC,CAAA;QACnD,MAAM,mBAAmB,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;QAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;QACvB,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QAEhC,IAAI,SAAS,IAAI,IAAI,IAAI,UAAU,IAAI,CAAC,IAAI,UAAU,IAAI,CAAC,IAAI,mBAAmB,IAAI,EAAE,EAAG;YACvF,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACxC;QAED,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAChB,IAAI;YACA,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACpB,MAAM,QAAQ,GAAG,MAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAC;YAC9G,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YAChB,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;YACxI,MAAM,SAAS,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,CAAA;YACzC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAA;SACrB;QAAC,OAAM,KAAK,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,0CAA0C,GAAG,KAAK,CAAC,CAAC;SACnE;IACL,CAAC;CAAA;AAED,OAAO,EAAE,UAAU,EAAE,CAAA;AAErB;;;;;;;;;;;;;;;;;;EAkBE"}
|
@@ -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['rinkeby'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
|
18
18
|
.connect(opportunityService.getSignersInterface())
|
19
19
|
.functions
|
20
20
|
.registerNewUser(universalAddress)
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"register-new-user.js","sourceRoot":"","sources":["../../../src/api/identity/register-new-user.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAC/C,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAGpD,SAAe,eAAe,CAAC,gBAAgB;;QAC/C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,
|
1
|
+
{"version":3,"file":"register-new-user.js","sourceRoot":"","sources":["../../../src/api/identity/register-new-user.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,QAAQ,EAAe,MAAM,QAAQ,CAAC;AAC/C,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,KAAK,UAAU,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAGpD,SAAe,eAAe,CAAC,gBAAgB;;QAC/C,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;aACrH,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;aACjD,SAAS;aACT,eAAe,CAAC,gBAAgB,CAAC;aACjC,IAAI,CAAC,KAAK,CAAC,EAAE;YACV,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC;aACD,KAAK,CAAC,KAAK,CAAC,EAAE;YACX,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAA;IACF,CAAC;CAAA;AAED,eAAe,eAAe,CAAC"}
|
@@ -1,9 +1,19 @@
|
|
1
|
-
import * as
|
2
|
-
const ethNetwork = 'rinkeby'; //
|
1
|
+
import * as addresses from '../../blockchain/addresses.json';
|
2
|
+
const ethNetwork = 'rinkeby'; //'rinkeby'
|
3
|
+
const addressMapToString = JSON.stringify(addresses);
|
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);
|
3
13
|
export default {
|
4
|
-
'MarketFactory': addressMap
|
5
|
-
'UserRegistration': addressMap
|
6
|
-
'Dai': addressMap
|
7
|
-
'Scheduler': addressMap
|
14
|
+
'MarketFactory': dig(addressMap, 'MarketFactory'),
|
15
|
+
'UserRegistration': dig(addressMap, 'UserRegistration'),
|
16
|
+
'Dai': dig(addressMap, 'Dai'),
|
17
|
+
'Scheduler': dig(addressMap, 'Scheduler')
|
8
18
|
};
|
9
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,
|
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
|
}
|
package/package.json
CHANGED
@@ -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['rinkeby'][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['rinkeby']['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['rinkeby'][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION])
|
11
11
|
.connect(opportunityService.getSignersInterface())
|
12
12
|
.functions
|
13
13
|
.registerNewUser(universalAddress)
|
@@ -1,11 +1,22 @@
|
|
1
1
|
import opportunityService from '../../OpportunityService';
|
2
|
-
import * as
|
2
|
+
import * as addresses from '../../blockchain/addresses.json';
|
3
|
+
|
4
|
+
const ethNetwork = 'rinkeby' //'rinkeby'
|
5
|
+
const addressMapToString = JSON.stringify(addresses)
|
6
|
+
const addressMap = JSON.parse(addressMapToString)
|
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);
|
3
15
|
|
4
|
-
const ethNetwork = 'rinkeby' //opportunityService.getEthNetwork()
|
5
16
|
|
6
17
|
export default {
|
7
|
-
'MarketFactory': addressMap
|
8
|
-
'UserRegistration': addressMap
|
9
|
-
'Dai': addressMap
|
10
|
-
'Scheduler': addressMap
|
18
|
+
'MarketFactory': dig(addressMap, 'MarketFactory'),
|
19
|
+
'UserRegistration': dig(addressMap, 'UserRegistration'),
|
20
|
+
'Dai': dig(addressMap, 'Dai'),
|
21
|
+
'Scheduler': dig(addressMap, 'Scheduler')
|
11
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
|
}
|