opportunity-service 0.0.477 → 0.0.481
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/api/exchange/create-task.js +5 -9
- package/dist/api/exchange/create-task.js.map +1 -1
- package/dist/blockchain/addresses.json +3 -3
- package/dist/sync/process/processWorkRelationshipCreated.js +0 -1
- package/dist/sync/process/processWorkRelationshipCreated.js.map +1 -1
- package/package.json +3 -3
- package/src/api/exchange/create-task.ts +5 -11
- package/src/blockchain/addresses.json +3 -3
- package/src/sync/process/processWorkRelationshipCreated.ts +1 -1
|
@@ -41,21 +41,17 @@ const Tx = require("ethereumjs-tx").Transaction;
|
|
|
41
41
|
function createTask(data) {
|
|
42
42
|
return __awaiter(this, void 0, void 0, function* () {
|
|
43
43
|
const parsedData = JSON.parse(data);
|
|
44
|
-
console.log('Service printing data');
|
|
45
|
-
console.log(data);
|
|
46
44
|
const abi = abiMap[constants_1.Contracts.MARKET];
|
|
47
45
|
console.log(abi);
|
|
46
|
+
console.log(parsedData);
|
|
48
47
|
const taskOwner = parsedData["taskOwner"];
|
|
49
48
|
const taskMarket = parsedData["taskMarket"];
|
|
50
49
|
const taskBounty = parsedData["taskBounty"];
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
const taskMetadataPointer = parsedData["taskMetadataPointer"];
|
|
51
|
+
if (taskOwner == null || parseInt(taskMarket) == 0 || parseInt(taskBounty) == 0 || taskMetadataPointer == '') {
|
|
52
|
+
throw new Error('Null value in data');
|
|
53
|
+
}
|
|
55
54
|
try {
|
|
56
|
-
console.log('AAAAAAAAAAAAAA');
|
|
57
|
-
console.log(OpportunityService_1.default.getSignersInterface());
|
|
58
|
-
console.log(data);
|
|
59
55
|
const contract = yield new ethers_1.ethers.Contract(taskMarket, abi).connect(OpportunityService_1.default.getSignersInterface());
|
|
60
56
|
const txResponse = yield contract.functions.createJob(taskOwner, constants_1.ContractType.NORMAL, taskMetadataPointer, taskBounty, addressMap[constants_1.Contracts.DAI]);
|
|
61
57
|
console.log(txResponse);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-task.js","sourceRoot":"","sources":["../../../src/api/exchange/create-task.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA0D;AAI1D,kEAAoD;AACpD,4EAA6D;AAE7D,kFAA0D;AAC1D,mCAAgC;AAIhC,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC;AAEhD,SAAe,UAAU,CAAC,IAAI;;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,
|
|
1
|
+
{"version":3,"file":"create-task.js","sourceRoot":"","sources":["../../../src/api/exchange/create-task.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,+CAA0D;AAI1D,kEAAoD;AACpD,4EAA6D;AAE7D,kFAA0D;AAC1D,mCAAgC;AAIhC,MAAM,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,WAAW,CAAC;AAEhD,SAAe,UAAU,CAAC,IAAI;;QAC1B,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,GAAG,GAAG,MAAM,CAAC,qBAAS,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,UAAU,CAAC,YAAY,CAAC,CAAC;QAC5C,MAAM,mBAAmB,GAAG,UAAU,CAAC,qBAAqB,CAAC,CAAA;QAE7D,IAAI,SAAS,IAAI,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,mBAAmB,IAAI,EAAE,EAAG;YAC3G,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;SACxC;QAGD,IAAI;YACJ,MAAM,QAAQ,GAAG,MAAM,IAAI,eAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,4BAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAC;YAC9G,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,SAAS,CAAC,SAAS,CAAC,SAAS,EAAE,wBAAY,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,EAAE,UAAU,CAAC,qBAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YAClJ,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;SACtB;QAAC,OAAM,KAAK,EAAE;YACX,OAAO,CAAC,GAAG,CAAC,0CAA0C,GAAG,KAAK,CAAC,CAAC;SACnE;IACL,CAAC;CAAA;AAEQ,gCAAU"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"MarketFactory": "
|
|
3
|
-
"UserRegistration": "
|
|
4
|
-
"Dai": "
|
|
2
|
+
"MarketFactory": "0xa0aF594fB3C72c1EE9b29Aa10e34C05Fcfb32Ee9",
|
|
3
|
+
"UserRegistration": "0xf5594c2ceFe7aF7C6cb7Ba6Aa04a3621C6f13DF2",
|
|
4
|
+
"Dai": "0x934a750b1b0e3a4f8ad0ceB6ed3E21e248EC4fAE"
|
|
5
5
|
}
|
|
@@ -49,7 +49,6 @@ function processWorkRelationshipCreatedEvent(log) {
|
|
|
49
49
|
const relationshipType = 0;
|
|
50
50
|
//process contents of metadata pointer
|
|
51
51
|
let relationshipMetadata = {}; //opportunityService.storageProvider.retrieveContent(relationshipTaskMetadataPointer);
|
|
52
|
-
console.log('Unsuccessful fetch of file contents from ipfs');
|
|
53
52
|
let relationshipData = {
|
|
54
53
|
relationshipOwner,
|
|
55
54
|
relationshipAddress,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processWorkRelationshipCreated.js","sourceRoot":"","sources":["../../../src/sync/process/processWorkRelationshipCreated.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA0E;AAC1E,kEAAoD;AAEpD,kFAA0D;AAE1D,mCAAgC;AAEhC,mGAA2E;
|
|
1
|
+
{"version":3,"file":"processWorkRelationshipCreated.js","sourceRoot":"","sources":["../../../src/sync/process/processWorkRelationshipCreated.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+CAA0E;AAC1E,kEAAoD;AAEpD,kFAA0D;AAE1D,mCAAgC;AAEhC,mGAA2E;AAG3E;;;;GAIG;AACH,SAAS,mCAAmC,CAAC,GAAG;IAC5C,IAAI;QACJ,MAAM,KAAK,GAAe,IAAI,eAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,qBAAS,CAAC,MAAM,CAAC,CAAC,CAAC;QAC/E,MAAM,UAAU,GAAoB,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACxD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,UAAU,CAAC;QAEvC,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,mBAAmB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpC,MAAM,yBAAyB,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QAE1C,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,SAAS,GAAG,cAAc;cACpD,SAAS,GAAG,iBAAiB,GAAG,aAAa,GAAI,mBAAmB,GAAG,wBAAwB,GAAG,mBAAmB,CAAC,CAAC;QAEzH,MAAM,4BAA4B,GAAG,IAAI,eAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,qBAAS,CAAC,iBAAiB,CAAC,EAAE,4BAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAA;QAC5J,MAAM,+BAA+B,GAAG,4BAA4B,CAAC,oBAAoB,EAAE,CAAC;QAC5F,MAAM,kBAAkB,GAAG,CAAC,CAAA,CAAC,oDAAoD;QACjF,MAAM,gBAAgB,GAAG,CAAC,CAAC;QAE3B,sCAAsC;QACtC,IAAI,oBAAoB,GAAG,EAAE,CAAA,CAAC,sFAAsF;QAEpH,IAAI,gBAAgB,GAAG;YACnB,iBAAiB;YACjB,mBAAmB;YACnB,yBAAyB;YACzB,kBAAkB;YAClB,oBAAoB;YACpB,gBAAgB;SACnB,CAAA;QAED,iCAAuB,CAAC,IAAI,CAAC,0BAAc,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,CAAC;KAC1F;IAAC,OAAM,KAAK,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACrB;AACD,CAAC;AAEQ,kFAAmC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "opportunity-service",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.481",
|
|
4
4
|
"description": "A service layer that connects all services between the blockchain and ui.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {},
|
|
@@ -19,8 +19,7 @@
|
|
|
19
19
|
"chai": "^4.3.4",
|
|
20
20
|
"chai-as-promised": "^7.1.1",
|
|
21
21
|
"chai-bn": "^0.2.1",
|
|
22
|
-
"mocha": "^8.3.2"
|
|
23
|
-
"typescript": "^4.2.4"
|
|
22
|
+
"mocha": "^8.3.2"
|
|
24
23
|
},
|
|
25
24
|
"dependencies": {
|
|
26
25
|
"@toruslabs/torus-embed": "^1.10.14",
|
|
@@ -45,6 +44,7 @@
|
|
|
45
44
|
"mongodb": "^3.6.9",
|
|
46
45
|
"mongoose": "^5.12.12",
|
|
47
46
|
"sqlite3": "^5.0.2",
|
|
47
|
+
"typescript": "^4.4.3",
|
|
48
48
|
"web3": "^1.3.5"
|
|
49
49
|
}
|
|
50
50
|
}
|
|
@@ -15,29 +15,23 @@ const Tx = require("ethereumjs-tx").Transaction;
|
|
|
15
15
|
|
|
16
16
|
async function createTask(data) : Promise<void> {
|
|
17
17
|
const parsedData = JSON.parse(data);
|
|
18
|
-
console.log('Service printing data')
|
|
19
|
-
console.log(data)
|
|
20
|
-
|
|
21
18
|
const abi = abiMap[Contracts.MARKET];
|
|
22
19
|
console.log(abi)
|
|
20
|
+
console.log(parsedData)
|
|
23
21
|
|
|
24
22
|
const taskOwner = parsedData["taskOwner"];
|
|
25
23
|
const taskMarket = parsedData["taskMarket"]
|
|
26
24
|
const taskBounty = parsedData["taskBounty"];
|
|
25
|
+
const taskMetadataPointer = parsedData["taskMetadataPointer"]
|
|
27
26
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
27
|
+
if (taskOwner == null || parseInt(taskMarket) == 0 || parseInt(taskBounty) == 0 || taskMetadataPointer == '' ) {
|
|
28
|
+
throw new Error('Null value in data')
|
|
29
|
+
}
|
|
31
30
|
|
|
32
|
-
const taskMetadataPointer = ''; //= await opportunityStorageProvider.storeRawContent(data);
|
|
33
31
|
|
|
34
32
|
try {
|
|
35
|
-
console.log('AAAAAAAAAAAAAA')
|
|
36
|
-
console.log(opportunityService.getSignersInterface())
|
|
37
|
-
console.log(data)
|
|
38
33
|
const contract = await new ethers.Contract(taskMarket, abi).connect(opportunityService.getSignersInterface());
|
|
39
34
|
const txResponse = await contract.functions.createJob(taskOwner, ContractType.NORMAL, taskMetadataPointer, taskBounty, addressMap[Contracts.DAI]);
|
|
40
|
-
|
|
41
35
|
console.log(txResponse)
|
|
42
36
|
} catch(error) {
|
|
43
37
|
console.log('Service: Caught error creating new job: ' + error);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"MarketFactory": "
|
|
3
|
-
"UserRegistration": "
|
|
4
|
-
"Dai": "
|
|
2
|
+
"MarketFactory": "0xa0aF594fB3C72c1EE9b29Aa10e34C05Fcfb32Ee9",
|
|
3
|
+
"UserRegistration": "0xf5594c2ceFe7aF7C6cb7Ba6Aa04a3621C6f13DF2",
|
|
4
|
+
"Dai": "0x934a750b1b0e3a4f8ad0ceB6ed3E21e248EC4fAE"
|
|
5
5
|
}
|
|
@@ -7,6 +7,7 @@ import { ethers } from 'ethers';
|
|
|
7
7
|
import { AbiCoder, EventFragment, Interface, LogDescription, Result } from '@ethersproject/abi';
|
|
8
8
|
import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
|
|
9
9
|
|
|
10
|
+
|
|
10
11
|
/**
|
|
11
12
|
* WorkRelationshipCreated(address owner, address relationship, address market)
|
|
12
13
|
* @param log
|
|
@@ -32,7 +33,6 @@ function processWorkRelationshipCreatedEvent(log) {
|
|
|
32
33
|
|
|
33
34
|
//process contents of metadata pointer
|
|
34
35
|
let relationshipMetadata = {} //opportunityService.storageProvider.retrieveContent(relationshipTaskMetadataPointer);
|
|
35
|
-
console.log('Unsuccessful fetch of file contents from ipfs');
|
|
36
36
|
|
|
37
37
|
let relationshipData = {
|
|
38
38
|
relationshipOwner,
|