opportunity-service 0.0.646 → 0.0.651
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/api/ethereum/sendAsync.js +4 -0
- package/dist/api/ethereum/sendAsync.js.map +1 -1
- package/dist/api/exchange/create-task.js +3 -3
- package/dist/api/exchange/create-task.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/ethereum/sendAsync.ts +4 -0
- package/src/api/exchange/create-task.ts +4 -4
- package/src/blockchain/addresses.json +2 -4
@@ -26,6 +26,10 @@ export function sendAsync(method, params, from) {
|
|
26
26
|
const r = '0x' + realResult.slice(0, 64);
|
27
27
|
const s = '0x' + realResult.slice(64, 128);
|
28
28
|
const v = parseInt(realResult.substring(128, 130), 16);
|
29
|
+
console.log('Service: ' + realResult);
|
30
|
+
console.log('R: ' + r);
|
31
|
+
console.log('S: ' + s);
|
32
|
+
console.log('V: ' + v);
|
29
33
|
resolve({
|
30
34
|
v, r, s
|
31
35
|
});
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sendAsync.js","sourceRoot":"","sources":["../../../src/api/ethereum/sendAsync.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,MAAM,UAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI;;QAChD,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,kBAAkB,CAAC,2BAA2B,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC7E,EAAE,EAAE,CAAC;gBACL,MAAM;gBACN,MAAM;gBACN,IAAI;aACL,EAAE,UAAe,KAAK,EAAE,MAAM;;oBAC7B,IAAI,KAAK,EAAE;wBACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;wBAClB,MAAM,KAAK,CAAC;qBACb;oBAEC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;oBACpD,MAAM,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACzC,MAAM,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;oBAC3C,MAAM,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;oBAEvD,OAAO,CAAC;wBACJ,CAAC,EAAE,CAAC,EAAE,CAAC;qBACV,CAAC,CAAA;gBAEN,CAAC;aAAA,CAAC,CAAC;QACL,CAAC,CAAA,CAAC,CAAA;IACN,CAAC;CAAA"}
|
1
|
+
{"version":3,"file":"sendAsync.js","sourceRoot":"","sources":["../../../src/api/ethereum/sendAsync.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,MAAM,UAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI;;QAChD,OAAO,IAAI,OAAO,CAAC,CAAO,OAAO,EAAE,MAAM,EAAE,EAAE;YAC7C,MAAM,kBAAkB,CAAC,2BAA2B,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;gBAC7E,EAAE,EAAE,CAAC;gBACL,MAAM;gBACN,MAAM;gBACN,IAAI;aACL,EAAE,UAAe,KAAK,EAAE,MAAM;;oBAC7B,IAAI,KAAK,EAAE;wBACT,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;wBAClB,MAAM,KAAK,CAAC;qBACb;oBAEC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;oBACpD,MAAM,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACzC,MAAM,CAAC,GAAG,IAAI,GAAG,UAAU,CAAC,KAAK,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;oBAC3C,MAAM,CAAC,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC;oBAEvD,OAAO,CAAC,GAAG,CAAC,WAAW,GAAG,UAAU,CAAC,CAAA;oBACrC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;oBACtB,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAA;oBACtB,OAAO,CAAC;wBACJ,CAAC,EAAE,CAAC,EAAE,CAAC;qBACV,CAAC,CAAA;gBAEN,CAAC;aAAA,CAAC,CAAC;QACL,CAAC,CAAA,CAAC,CAAA;IACN,CAAC;CAAA"}
|
@@ -8,8 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
8
8
|
});
|
9
9
|
};
|
10
10
|
import { Contracts, ContractType } from "../../constants";
|
11
|
-
import
|
12
|
-
import
|
11
|
+
import abiMap from '../../blockchain/abi.json';
|
12
|
+
import addressMap from '../../blockchain/addresses.json';
|
13
13
|
import opportunityService from "../../OpportunityService";
|
14
14
|
import { ethers } from 'ethers';
|
15
15
|
const Tx = require("ethereumjs-tx").Transaction;
|
@@ -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,
|
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"}
|
@@ -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
@@ -19,6 +19,10 @@ export async function sendAsync(method, params, from) {
|
|
19
19
|
const s = '0x' + realResult.slice(64, 128);
|
20
20
|
const v = parseInt(realResult.substring(128, 130), 16);
|
21
21
|
|
22
|
+
console.log('Service: ' + realResult)
|
23
|
+
console.log('R: ' + r)
|
24
|
+
console.log('S: ' + s)
|
25
|
+
console.log('V: ' + v)
|
22
26
|
resolve({
|
23
27
|
v, r, s
|
24
28
|
})
|
@@ -3,9 +3,9 @@ import { Contracts, ContractType } from "../../constants";
|
|
3
3
|
import opportunityEventEmitter from "../../events/OpportunityEventEmitter";
|
4
4
|
import { ParamObject } from "../../types";
|
5
5
|
|
6
|
-
import
|
7
|
-
import
|
8
|
-
import
|
6
|
+
import abiMap from '../../blockchain/abi.json';
|
7
|
+
import addressMap from '../../blockchain/addresses.json'
|
8
|
+
import bytecodeMap from '../../blockchain/bytecode.json';
|
9
9
|
import opportunityService from "../../OpportunityService";
|
10
10
|
import { ethers } from 'ethers';
|
11
11
|
import opportunityStorageProvider from "../../modules/storage/OpportunityStorageProvider";
|
@@ -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) {
|
@@ -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
|
|