opportunity-service 0.0.649 → 0.0.654
Sign up to get free protection for your applications and to get access to all the features.
- 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 +39 -14
- package/dist/api/identity/register-new-user.js.map +1 -1
- package/dist/blockchain/addresses.json +1 -3
- package/package.json +1 -1
- package/src/OpportunityService.ts +1 -1
- package/src/api/exchange/create-task.ts +1 -1
- package/src/api/identity/register-new-user.ts +45 -16
- package/src/blockchain/addresses.json +2 -4
@@ -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(
|
41
|
+
const txResponse = yield contract.functions.createJob(ContractType.NORMAL, taskMetadataPointer, addressMap[opportunityService.getEthNetwork()][Contracts.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,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,UAAU,MAAM,iCAAiC,CAAA;AAExD,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,
|
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,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAO,UAAU,MAAM,iCAAiC,CAAA;AAExD,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,YAAY,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;YAC9J,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"}
|
@@ -7,26 +7,51 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
7
7
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
8
8
|
});
|
9
9
|
};
|
10
|
-
import { Contract } from 'ethers';
|
10
|
+
import { Contract, ethers } from 'ethers';
|
11
11
|
import opportunityService from '../../OpportunityService';
|
12
12
|
import { Contracts } from '../../constants';
|
13
13
|
import addressMap from '../../blockchain/addresses.json';
|
14
14
|
import abiMap from '../../blockchain/abi.json';
|
15
15
|
function registerNewUser() {
|
16
16
|
return __awaiter(this, void 0, void 0, function* () {
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
17
|
+
return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
|
18
|
+
try {
|
19
|
+
const userRegistrationAddress = addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION];
|
20
|
+
const userRegistrationInterface = abiMap[Contracts.USER_REGISTRATION];
|
21
|
+
const msgSender = yield opportunityService.getSignersInterface()._address;
|
22
|
+
if (typeof msgSender == 'undefined')
|
23
|
+
throw new Error('Message sender is undefined');
|
24
|
+
const userRegistrationInstance = new ethers.Contract(userRegistrationAddress, userRegistrationInterface, opportunityService.getProviderInterface());
|
25
|
+
console.log('Checking true identificaiton of msgSender: ' + msgSender);
|
26
|
+
console.log('The true identificaiton is: ' + userRegistrationInstance.getTrueIdentification(msgSender));
|
27
|
+
if (userRegistrationInstance.getTrueIdentification(msgSender) == '0x0000000000000000000000000000000000000000') {
|
28
|
+
console.log('Registering new user: ' + msgSender);
|
29
|
+
const tx = new Contract(addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION], abiMap[Contracts.USER_REGISTRATION]).connect(opportunityService.getSignersInterface())
|
30
|
+
.registerNewUser({
|
31
|
+
from: msgSender
|
32
|
+
});
|
33
|
+
const receipt = yield tx.wait();
|
34
|
+
console.log('the receipt');
|
35
|
+
console.log(receipt);
|
36
|
+
if (Number(receipt.status) === 1) {
|
37
|
+
console.log('transaction succeeded');
|
38
|
+
resolve(true);
|
39
|
+
}
|
40
|
+
else {
|
41
|
+
console.log('Transaction failed');
|
42
|
+
resolve(false);
|
43
|
+
}
|
44
|
+
}
|
45
|
+
else {
|
46
|
+
console.log('User already registered');
|
47
|
+
resolve(false);
|
48
|
+
}
|
49
|
+
}
|
50
|
+
catch (error) {
|
51
|
+
console.log(error);
|
52
|
+
reject('An error occurred while trying to complete the registration.');
|
53
|
+
}
|
54
|
+
}));
|
30
55
|
});
|
31
56
|
}
|
32
57
|
export default registerNewUser;
|
@@ -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;
|
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,EAAe,MAAM,QAAQ,CAAC;AACvD,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,OAAO,UAAU,MAAM,iCAAiC,CAAA;AACxD,OAAO,MAAM,MAAM,2BAA2B,CAAA;AAG9C,SAAe,eAAe;;QAC1B,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI;gBACA,MAAM,uBAAuB,GAAG,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;gBAC3G,MAAM,yBAAyB,GAAG,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAA;gBACrE,MAAM,SAAS,GAAG,MAAM,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,QAAQ,CAAA;gBAEzE,IAAI,OAAO,SAAS,IAAI,WAAW;oBAAE,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAA;gBAEnF,MAAM,wBAAwB,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,uBAAuB,EAAE,yBAAyB,EAAE,kBAAkB,CAAC,oBAAoB,EAAE,CAAC,CAAA;gBAEnJ,OAAO,CAAC,GAAG,CAAC,6CAA6C,GAAG,SAAS,CAAC,CAAA;gBACtE,OAAO,CAAC,GAAG,CAAC,8BAA8B,GAAG,wBAAwB,CAAC,qBAAqB,CAAC,SAAS,CAAC,CAAC,CAAA;gBAEvG,IAAI,wBAAwB,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,4CAA4C,EAC7G;oBACI,OAAO,CAAC,GAAG,CAAC,wBAAwB,GAAG,SAAS,CAAC,CAAA;oBACjD,MAAM,EAAE,GAAG,IAAI,QAAQ,CACnB,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAC3E,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,CAAC;yBACrF,eAAe,CAAC;wBACb,IAAI,EAAE,SAAS;qBACtB,CAAC,CAAA;oBAEF,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;oBAC/B,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;oBAC1B,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAEpB,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;wBAC9B,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAA;wBACpC,OAAO,CAAC,IAAI,CAAC,CAAC;qBACjB;yBAAM;wBACH,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;wBACjC,OAAO,CAAC,KAAK,CAAC,CAAA;qBACjB;iBACJ;qBAAM;oBACH,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,CAAA;oBACtC,OAAO,CAAC,KAAK,CAAC,CAAA;iBACjB;aAGJ;YAAC,OAAM,KAAK,EAAE;gBACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;gBAClB,MAAM,CAAC,8DAA8D,CAAC,CAAA;aACzE;QACL,CAAC,CAAA,CAAC,CAAA;IACN,CAAC;CAAA;AAED,eAAe,eAAe,CAAC"}
|
@@ -2,13 +2,11 @@
|
|
2
2
|
"rinkeby": {
|
3
3
|
"MarketFactory": "0x850cADCF43FB7a40F8aD0C09e7F4B4A649598298",
|
4
4
|
"UserRegistration": "0x31799946e72a44273515556e366e059064Df8ca2",
|
5
|
-
"UserSummaryFactory": "0x9d64421D3472E1c1776d5E4C2d1Fdb71A1B4b541",
|
6
5
|
"Dai": "0x5592ec0cfb4dbc12d3ab100b257153436a1f0fea"
|
7
6
|
},
|
8
7
|
"mainnet": {
|
9
8
|
"MarketFactory": "0x9fd244e5972F28e2F133bd3dAA5A6691C8E6d1c7",
|
10
|
-
"UserRegistration": "
|
11
|
-
"UserSummaryFactory": "0xA31Ea4553E82e08b3F411B29C009ECd45AE1738B",
|
9
|
+
"UserRegistration": "0xA31Ea4553E82e08b3F411B29C009ECd45AE1738B",
|
12
10
|
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f"
|
13
11
|
},
|
14
12
|
"xdai": {}
|
package/package.json
CHANGED
@@ -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(
|
43
|
+
const txResponse = await contract.functions.createJob(ContractType.NORMAL, taskMetadataPointer, addressMap[opportunityService.getEthNetwork()][Contracts.DAI])
|
44
44
|
const txReceipt = await txResponse.wait()
|
45
45
|
console.log(txReceipt)
|
46
46
|
} catch(error) {
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import { Contract, Transaction } from 'ethers';
|
1
|
+
import { Contract, ethers, Transaction } from 'ethers';
|
2
2
|
import opportunityService from '../../OpportunityService';
|
3
3
|
import { Contracts } from '../../constants';
|
4
4
|
|
@@ -7,22 +7,51 @@ import abiMap from '../../blockchain/abi.json'
|
|
7
7
|
import { Result } from 'ethers/lib/utils';
|
8
8
|
|
9
9
|
async function registerNewUser() {
|
10
|
-
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
10
|
+
return new Promise(async (resolve, reject) => {
|
11
|
+
try {
|
12
|
+
const userRegistrationAddress = addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION]
|
13
|
+
const userRegistrationInterface = abiMap[Contracts.USER_REGISTRATION]
|
14
|
+
const msgSender = await opportunityService.getSignersInterface()._address
|
15
|
+
|
16
|
+
if (typeof msgSender == 'undefined') throw new Error('Message sender is undefined')
|
17
|
+
|
18
|
+
const userRegistrationInstance = new ethers.Contract(userRegistrationAddress, userRegistrationInterface, opportunityService.getProviderInterface())
|
19
|
+
|
20
|
+
console.log('Checking true identificaiton of msgSender: ' + msgSender)
|
21
|
+
console.log('The true identificaiton is: ' + userRegistrationInstance.getTrueIdentification(msgSender))
|
22
|
+
|
23
|
+
if (userRegistrationInstance.getTrueIdentification(msgSender) == '0x0000000000000000000000000000000000000000')
|
24
|
+
{
|
25
|
+
console.log('Registering new user: ' + msgSender)
|
26
|
+
const tx = new Contract(
|
27
|
+
addressMap[opportunityService.getEthNetwork()][Contracts.USER_REGISTRATION],
|
28
|
+
abiMap[Contracts.USER_REGISTRATION]).connect(opportunityService.getSignersInterface())
|
29
|
+
.registerNewUser({
|
30
|
+
from: msgSender
|
31
|
+
})
|
32
|
+
|
33
|
+
const receipt = await tx.wait()
|
34
|
+
console.log('the receipt')
|
35
|
+
console.log(receipt)
|
36
|
+
|
37
|
+
if (Number(receipt.status) === 1) {
|
38
|
+
console.log('transaction succeeded')
|
39
|
+
resolve(true);
|
40
|
+
} else {
|
41
|
+
console.log('Transaction failed')
|
42
|
+
resolve(false)
|
43
|
+
}
|
44
|
+
} else {
|
45
|
+
console.log('User already registered')
|
46
|
+
resolve(false)
|
47
|
+
}
|
48
|
+
|
49
|
+
|
50
|
+
} catch(error) {
|
51
|
+
console.log(error)
|
52
|
+
reject('An error occurred while trying to complete the registration.')
|
53
|
+
}
|
22
54
|
})
|
23
|
-
} catch(error) {
|
24
|
-
console.log(error)
|
25
|
-
}
|
26
55
|
}
|
27
56
|
|
28
57
|
export default registerNewUser;
|
@@ -2,14 +2,12 @@
|
|
2
2
|
"rinkeby": {
|
3
3
|
"MarketFactory": "0x850cADCF43FB7a40F8aD0C09e7F4B4A649598298",
|
4
4
|
"UserRegistration": "0x31799946e72a44273515556e366e059064Df8ca2",
|
5
|
-
"UserSummaryFactory": "0x9d64421D3472E1c1776d5E4C2d1Fdb71A1B4b541",
|
6
5
|
"Dai": "0x5592ec0cfb4dbc12d3ab100b257153436a1f0fea"
|
7
6
|
},
|
8
7
|
"mainnet": {
|
9
8
|
"MarketFactory": "0x9fd244e5972F28e2F133bd3dAA5A6691C8E6d1c7",
|
10
|
-
"UserRegistration": "
|
11
|
-
"
|
12
|
-
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f",
|
9
|
+
"UserRegistration": "0xA31Ea4553E82e08b3F411B29C009ECd45AE1738B",
|
10
|
+
"Dai": "0x6b175474e89094c44da98b954eedeac495271d0f"
|
13
11
|
},
|
14
12
|
"xdai": {
|
15
13
|
|