opportunity-service 0.0.643 → 0.0.647

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. package/dist/api/exchange/create-task.js +2 -2
  2. package/dist/api/exchange/create-task.js.map +1 -1
  3. package/dist/blockchain/abi.json +87 -144
  4. package/dist/sync/process/process-log.js +0 -9
  5. package/dist/sync/process/process-log.js.map +1 -1
  6. package/dist/sync/process/processWorkRelationshipCreated.js +1 -1
  7. package/dist/sync/process/processWorkRelationshipCreated.js.map +1 -1
  8. package/package.json +1 -1
  9. package/src/api/exchange/create-task.ts +3 -3
  10. package/src/blockchain/abi.json +87 -144
  11. package/src/sync/process/process-log.ts +0 -9
  12. package/src/sync/process/processWorkRelationshipCreated.ts +2 -2
package/dist/api/exchange/create-task.js CHANGED
@@ -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 * as abiMap from '../../blockchain/abi.json';
12
- import * as addressMap from '../../blockchain/addresses.json';
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;
package/dist/api/exchange/create-task.js.map CHANGED
@@ -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,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;YACzK,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"}
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,SAAS,EAAE,YAAY,CAAC,MAAM,EAAE,mBAAmB,EAAE,UAAU,CAAC,kBAAkB,CAAC,aAAa,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAA;YACzK,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"}
package/dist/blockchain/abi.json CHANGED
@@ -1,57 +1,34 @@
1
1
  {
2
2
  "MarketFactory": [
3
- {
4
- "inputs": [
5
- {
6
- "internalType": "string",
7
- "name": "_marketName",
8
- "type": "string"
9
- },
10
- {
11
- "internalType": "enum MarketLib.MarketType",
12
- "name": "_marketType",
13
- "type": "uint8"
14
- }
15
- ],
16
- "stateMutability": "nonpayable",
17
- "type": "constructor"
18
- },
19
3
  {
20
4
  "anonymous": false,
21
5
  "inputs": [
22
6
  {
23
7
  "indexed": true,
24
8
  "internalType": "address",
25
- "name": "participant",
9
+ "name": "_market",
26
10
  "type": "address"
27
- }
28
- ],
29
- "name": "NewMarketParticipant",
30
- "type": "event"
31
- },
32
- {
33
- "anonymous": false,
34
- "inputs": [
11
+ },
35
12
  {
36
13
  "indexed": true,
37
- "internalType": "address",
38
- "name": "owner",
39
- "type": "address"
14
+ "internalType": "uint256",
15
+ "name": "index",
16
+ "type": "uint256"
40
17
  },
41
18
  {
42
- "indexed": true,
19
+ "indexed": false,
43
20
  "internalType": "address",
44
- "name": "relationship",
21
+ "name": "owner",
45
22
  "type": "address"
46
23
  },
47
24
  {
48
- "indexed": true,
49
- "internalType": "address",
50
- "name": "marketAddress",
51
- "type": "address"
25
+ "indexed": false,
26
+ "internalType": "string",
27
+ "name": "marketName",
28
+ "type": "string"
52
29
  }
53
30
  ],
54
- "name": "WorkRelationshipCreated",
31
+ "name": "MarketCreated",
55
32
  "type": "event"
56
33
  },
57
34
  {
@@ -60,68 +37,27 @@
60
37
  {
61
38
  "indexed": true,
62
39
  "internalType": "address",
63
- "name": "owner",
64
- "type": "address"
65
- },
66
- {
67
- "indexed": true,
68
- "internalType": "address",
69
- "name": "relationship",
40
+ "name": "_marketAddress",
70
41
  "type": "address"
71
42
  }
72
43
  ],
73
- "name": "WorkRelationshipEnded",
44
+ "name": "MarketDestroyed",
74
45
  "type": "event"
75
46
  },
76
47
  {
77
48
  "inputs": [
78
- {
79
- "internalType": "address",
80
- "name": "taskOwner",
81
- "type": "address"
82
- },
83
- {
84
- "internalType": "enum Evaluation.ContractType",
85
- "name": "_contractType",
86
- "type": "uint8"
87
- },
88
- {
89
- "internalType": "string",
90
- "name": "taskMetadataPointer",
91
- "type": "string"
92
- },
93
- {
94
- "internalType": "address",
95
- "name": "_daiTokenAddress",
96
- "type": "address"
97
- }
98
- ],
99
- "name": "createJob",
100
- "outputs": [],
101
- "stateMutability": "nonpayable",
102
- "type": "function"
103
- },
104
- {
105
- "inputs": [],
106
- "name": "getNumJobs",
107
- "outputs": [
108
49
  {
109
50
  "internalType": "uint256",
110
51
  "name": "",
111
52
  "type": "uint256"
112
53
  }
113
54
  ],
114
- "stateMutability": "view",
115
- "type": "function"
116
- },
117
- {
118
- "inputs": [],
119
- "name": "getWorkRelationships",
55
+ "name": "_createdMarkets",
120
56
  "outputs": [
121
57
  {
122
- "internalType": "address[]",
58
+ "internalType": "address",
123
59
  "name": "",
124
- "type": "address[]"
60
+ "type": "address"
125
61
  }
126
62
  ],
127
63
  "stateMutability": "view",
@@ -130,69 +66,57 @@
130
66
  {
131
67
  "inputs": [
132
68
  {
133
- "internalType": "address",
134
- "name": "_owner",
135
- "type": "address"
136
- }
137
- ],
138
- "name": "getWorkRelationshipsByOwner",
139
- "outputs": [
69
+ "internalType": "string",
70
+ "name": "marketName",
71
+ "type": "string"
72
+ },
140
73
  {
141
- "internalType": "address[]",
142
- "name": "",
143
- "type": "address[]"
74
+ "internalType": "enum MarketLib.MarketType",
75
+ "name": "marketType",
76
+ "type": "uint8"
144
77
  }
145
78
  ],
146
- "stateMutability": "view",
79
+ "name": "createMarket",
80
+ "outputs": [],
81
+ "stateMutability": "nonpayable",
147
82
  "type": "function"
148
83
  },
149
84
  {
150
- "inputs": [],
151
- "name": "marketName",
152
- "outputs": [
85
+ "inputs": [
153
86
  {
154
- "internalType": "string",
155
- "name": "",
156
- "type": "string"
87
+ "internalType": "uint32",
88
+ "name": "index",
89
+ "type": "uint32"
157
90
  }
158
91
  ],
159
- "stateMutability": "view",
92
+ "name": "destroyMarket",
93
+ "outputs": [],
94
+ "stateMutability": "nonpayable",
160
95
  "type": "function"
161
96
  },
162
97
  {
163
98
  "inputs": [],
164
- "name": "marketType",
99
+ "name": "getMarkets",
165
100
  "outputs": [
166
101
  {
167
- "internalType": "enum MarketLib.MarketType",
102
+ "internalType": "address[]",
168
103
  "name": "",
169
- "type": "uint8"
104
+ "type": "address[]"
170
105
  }
171
106
  ],
172
107
  "stateMutability": "view",
173
108
  "type": "function"
174
109
  },
175
110
  {
176
- "inputs": [
177
- {
178
- "internalType": "address",
179
- "name": "",
180
- "type": "address"
181
- },
111
+ "inputs": [],
112
+ "name": "getNumMarkets",
113
+ "outputs": [
182
114
  {
183
115
  "internalType": "uint256",
184
116
  "name": "",
185
117
  "type": "uint256"
186
118
  }
187
119
  ],
188
- "name": "relationshipsToOwner",
189
- "outputs": [
190
- {
191
- "internalType": "address",
192
- "name": "",
193
- "type": "address"
194
- }
195
- ],
196
120
  "stateMutability": "view",
197
121
  "type": "function"
198
122
  }
@@ -738,12 +662,12 @@
738
662
  "inputs": [
739
663
  {
740
664
  "internalType": "string",
741
- "name": "marketName",
665
+ "name": "_marketName",
742
666
  "type": "string"
743
667
  },
744
668
  {
745
669
  "internalType": "enum MarketLib.MarketType",
746
- "name": "marketType",
670
+ "name": "_marketType",
747
671
  "type": "uint8"
748
672
  }
749
673
  ],
@@ -807,32 +731,6 @@
807
731
  "name": "WorkRelationshipEnded",
808
732
  "type": "event"
809
733
  },
810
- {
811
- "inputs": [],
812
- "name": "_marketName",
813
- "outputs": [
814
- {
815
- "internalType": "string",
816
- "name": "",
817
- "type": "string"
818
- }
819
- ],
820
- "stateMutability": "view",
821
- "type": "function"
822
- },
823
- {
824
- "inputs": [],
825
- "name": "_marketType",
826
- "outputs": [
827
- {
828
- "internalType": "enum MarketLib.MarketType",
829
- "name": "",
830
- "type": "uint8"
831
- }
832
- ],
833
- "stateMutability": "view",
834
- "type": "function"
835
- },
836
734
  {
837
735
  "inputs": [
838
736
  {
@@ -861,6 +759,25 @@
861
759
  "stateMutability": "nonpayable",
862
760
  "type": "function"
863
761
  },
762
+ {
763
+ "inputs": [
764
+ {
765
+ "internalType": "uint256",
766
+ "name": "",
767
+ "type": "uint256"
768
+ }
769
+ ],
770
+ "name": "createdJobs",
771
+ "outputs": [
772
+ {
773
+ "internalType": "address",
774
+ "name": "",
775
+ "type": "address"
776
+ }
777
+ ],
778
+ "stateMutability": "view",
779
+ "type": "function"
780
+ },
864
781
  {
865
782
  "inputs": [],
866
783
  "name": "getNumJobs",
@@ -906,6 +823,32 @@
906
823
  "stateMutability": "view",
907
824
  "type": "function"
908
825
  },
826
+ {
827
+ "inputs": [],
828
+ "name": "marketName",
829
+ "outputs": [
830
+ {
831
+ "internalType": "string",
832
+ "name": "",
833
+ "type": "string"
834
+ }
835
+ ],
836
+ "stateMutability": "view",
837
+ "type": "function"
838
+ },
839
+ {
840
+ "inputs": [],
841
+ "name": "marketType",
842
+ "outputs": [
843
+ {
844
+ "internalType": "enum MarketLib.MarketType",
845
+ "name": "",
846
+ "type": "uint8"
847
+ }
848
+ ],
849
+ "stateMutability": "view",
850
+ "type": "function"
851
+ },
909
852
  {
910
853
  "inputs": [
911
854
  {
package/dist/sync/process/process-log.js CHANGED
@@ -27,21 +27,15 @@ function processLog(log) {
27
27
  function processLogEvents(log) {
28
28
  let event = null;
29
29
  let hash = null;
30
- console.log(abiMap);
31
30
  const { data, topics } = log;
32
31
  for (var i = 0; i < ABI_LIST.length; i++) {
33
32
  var abis = abiMap[ABI_LIST[i].toString()];
34
- console.log(ABI_LIST[i].toString());
35
- console.log('abis');
36
- console.log(abis);
37
33
  for (const aItem in abis) {
38
- console.log(aItem);
39
34
  if (aItem['type'] == "event") {
40
35
  continue;
41
36
  }
42
37
  ;
43
38
  var signature = abis[aItem]['name'] + "(" + abis[aItem]['inputs'].map(function (input) { return input.type; }).join(",") + ")";
44
- console.log('Processing an event with the signature: ' + signature);
45
39
  hash = utils.id(signature);
46
40
  if (hash == topics[0]) {
47
41
  event = abis[aItem];
@@ -50,11 +44,8 @@ function processLogEvents(log) {
50
44
  }
51
45
  }
52
46
  if (event != null) {
53
- console.log('Event: ');
54
- console.log(event);
55
47
  switch (event['name']) {
56
48
  case "MarketCreated":
57
- console.log('MarketCreatedCase');
58
49
  processMarketCreatedEvent(log);
59
50
  break;
60
51
  case "MarketDestroyed":
package/dist/sync/process/process-log.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"process-log.js","sourceRoot":"","sources":["../../../src/sync/process/process-log.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"process-log.js","sourceRoot":"","sources":["../../../src/sync/process/process-log.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA2B,MAAM,iBAAiB,CAAC;AACpE,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAC/C,OAAQ,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAE5E,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,EAAE,mCAAmC,EAAE,MAAM,kCAAkC,CAAC;AACvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE;;;;;;;;;;;;;;GAcG;AACH,SAAS,UAAU,CAAC,GAAG;IACnB,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAChB,gBAAgB,CAAC,GAAG,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAG;IACzB,IAAI,KAAK,GAAG,IAAI,CAAC;IACjB,IAAI,IAAI,GAAG,IAAI,CAAC;IAChB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC;IAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACtC,IAAI,IAAI,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC1C,KAAK,MAAM,KAAK,IAAI,IAAI,EAAE;YACtB,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,OAAO,EAAE;gBAAE,SAAS;aAAE;YAAA,CAAC;YAC5C,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,UAAU,KAAK,IAAI,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC;YAC/H,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;YAC3B,IAAI,IAAI,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE;gBACnB,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpB,MAAM;aACT;SACJ;KACJ;IAED,IAAI,KAAK,IAAI,IAAI,EAAE;QACf,QAAO,KAAK,CAAC,MAAM,CAAC,EAAE;YAClB,KAAK,eAAe;gBAChB,yBAAyB,CAAC,GAAG,CAAC,CAAC;gBAC/B,MAAM;YACV,KAAK,iBAAiB;gBAClB,2BAA2B,CAAC,GAAG,CAAC,CAAC;gBACjC,MAAM;YACV,KAAK,yBAAyB;gBAC1B,mCAAmC,CAAC,GAAG,CAAC,CAAC;gBACzC,MAAM;YACV,KAAK,oBAAoB;gBACrB,yBAAyB,CAAC,GAAG,CAAC,CAAA;YAClC,QAAQ;SACX;KACJ;SAAM;QACH,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAA;KACrD;AACL,CAAC;AAED,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,CAAC"}
package/dist/sync/process/processWorkRelationshipCreated.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Contracts, ExchangeEvents } from '../../constants';
2
- import * as abiMap from '../../blockchain/abi.json';
2
+ import abiMap from '../../blockchain/abi.json';
3
3
  import opportunityService from '../../OpportunityService';
4
4
  import { ethers } from 'ethers';
5
5
  import opportunityEventEmitter from '../../events/OpportunityEventEmitter';
package/dist/sync/process/processWorkRelationshipCreated.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"processWorkRelationshipCreated.js","sourceRoot":"","sources":["../../../src/sync/process/processWorkRelationshipCreated.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAgB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,KAAK,MAAM,MAAM,2BAA2B,CAAC;AAEpD,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAG3E;;;;GAIG;AACH,SAAS,mCAAmC,CAAC,GAAG;IAC5C,IAAI;QACJ,MAAM,KAAK,GAAe,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,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,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAA;QAC5J,MAAM,kBAAkB,GAAG,CAAC,CAAA,CAAC,oDAAoD;QACjF,MAAM,gBAAgB,GAAG,CAAC,CAAC;QAE3B,IAAI,gBAAgB,GAAG;YACnB,iBAAiB;YACjB,mBAAmB;YACnB,yBAAyB;YACzB,kBAAkB;YAClB,gBAAgB;SACnB,CAAA;QAED,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,CAAC;KAC1F;IAAC,OAAM,KAAK,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACrB;AACD,CAAC;AAED,OAAO,EAAE,mCAAmC,EAAE,CAAC"}
1
+ {"version":3,"file":"processWorkRelationshipCreated.js","sourceRoot":"","sources":["../../../src/sync/process/processWorkRelationshipCreated.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAgB,MAAM,iBAAiB,CAAC;AAC1E,OAAO,MAAM,MAAM,2BAA2B,CAAC;AAE/C,OAAO,kBAAkB,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,uBAAuB,MAAM,sCAAsC,CAAC;AAG3E;;;;GAIG;AACH,SAAS,mCAAmC,CAAC,GAAG;IAC5C,IAAI;QACJ,MAAM,KAAK,GAAe,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,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,MAAM,CAAC,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAC,EAAE,kBAAkB,CAAC,mBAAmB,EAAE,CAAC,CAAA;QAC5J,MAAM,kBAAkB,GAAG,CAAC,CAAA,CAAC,oDAAoD;QACjF,MAAM,gBAAgB,GAAG,CAAC,CAAC;QAE3B,IAAI,gBAAgB,GAAG;YACnB,iBAAiB;YACjB,mBAAmB;YACnB,yBAAyB;YACzB,kBAAkB;YAClB,gBAAgB;SACnB,CAAA;QAED,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,uBAAuB,EAAE,gBAAgB,CAAC,CAAC;KAC1F;IAAC,OAAM,KAAK,EAAE;QACX,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;KACrB;AACD,CAAC;AAED,OAAO,EAAE,mCAAmC,EAAE,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "opportunity-service",
3
- "version": "0.0.643",
3
+ "version": "0.0.647",
4
4
  "description": "A service layer that connects all services between the blockchain and ui.",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/api/exchange/create-task.ts CHANGED
@@ -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 * as abiMap from '../../blockchain/abi.json';
7
- import * as addressMap from '../../blockchain/addresses.json'
8
- import * as bytecodeMap from '../../blockchain/bytecode.json';
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";
package/src/blockchain/abi.json CHANGED
@@ -1,57 +1,34 @@
1
1
  {
2
2
  "MarketFactory": [
3
- {
4
- "inputs": [
5
- {
6
- "internalType": "string",
7
- "name": "_marketName",
8
- "type": "string"
9
- },
10
- {
11
- "internalType": "enum MarketLib.MarketType",
12
- "name": "_marketType",
13
- "type": "uint8"
14
- }
15
- ],
16
- "stateMutability": "nonpayable",
17
- "type": "constructor"
18
- },
19
3
  {
20
4
  "anonymous": false,
21
5
  "inputs": [
22
6
  {
23
7
  "indexed": true,
24
8
  "internalType": "address",
25
- "name": "participant",
9
+ "name": "_market",
26
10
  "type": "address"
27
- }
28
- ],
29
- "name": "NewMarketParticipant",
30
- "type": "event"
31
- },
32
- {
33
- "anonymous": false,
34
- "inputs": [
11
+ },
35
12
  {
36
13
  "indexed": true,
37
- "internalType": "address",
38
- "name": "owner",
39
- "type": "address"
14
+ "internalType": "uint256",
15
+ "name": "index",
16
+ "type": "uint256"
40
17
  },
41
18
  {
42
- "indexed": true,
19
+ "indexed": false,
43
20
  "internalType": "address",
44
- "name": "relationship",
21
+ "name": "owner",
45
22
  "type": "address"
46
23
  },
47
24
  {
48
- "indexed": true,
49
- "internalType": "address",
50
- "name": "marketAddress",
51
- "type": "address"
25
+ "indexed": false,
26
+ "internalType": "string",
27
+ "name": "marketName",
28
+ "type": "string"
52
29
  }
53
30
  ],
54
- "name": "WorkRelationshipCreated",
31
+ "name": "MarketCreated",
55
32
  "type": "event"
56
33
  },
57
34
  {
@@ -60,68 +37,27 @@
60
37
  {
61
38
  "indexed": true,
62
39
  "internalType": "address",
63
- "name": "owner",
64
- "type": "address"
65
- },
66
- {
67
- "indexed": true,
68
- "internalType": "address",
69
- "name": "relationship",
40
+ "name": "_marketAddress",
70
41
  "type": "address"
71
42
  }
72
43
  ],
73
- "name": "WorkRelationshipEnded",
44
+ "name": "MarketDestroyed",
74
45
  "type": "event"
75
46
  },
76
47
  {
77
48
  "inputs": [
78
- {
79
- "internalType": "address",
80
- "name": "taskOwner",
81
- "type": "address"
82
- },
83
- {
84
- "internalType": "enum Evaluation.ContractType",
85
- "name": "_contractType",
86
- "type": "uint8"
87
- },
88
- {
89
- "internalType": "string",
90
- "name": "taskMetadataPointer",
91
- "type": "string"
92
- },
93
- {
94
- "internalType": "address",
95
- "name": "_daiTokenAddress",
96
- "type": "address"
97
- }
98
- ],
99
- "name": "createJob",
100
- "outputs": [],
101
- "stateMutability": "nonpayable",
102
- "type": "function"
103
- },
104
- {
105
- "inputs": [],
106
- "name": "getNumJobs",
107
- "outputs": [
108
49
  {
109
50
  "internalType": "uint256",
110
51
  "name": "",
111
52
  "type": "uint256"
112
53
  }
113
54
  ],
114
- "stateMutability": "view",
115
- "type": "function"
116
- },
117
- {
118
- "inputs": [],
119
- "name": "getWorkRelationships",
55
+ "name": "_createdMarkets",
120
56
  "outputs": [
121
57
  {
122
- "internalType": "address[]",
58
+ "internalType": "address",
123
59
  "name": "",
124
- "type": "address[]"
60
+ "type": "address"
125
61
  }
126
62
  ],
127
63
  "stateMutability": "view",
@@ -130,69 +66,57 @@
130
66
  {
131
67
  "inputs": [
132
68
  {
133
- "internalType": "address",
134
- "name": "_owner",
135
- "type": "address"
136
- }
137
- ],
138
- "name": "getWorkRelationshipsByOwner",
139
- "outputs": [
69
+ "internalType": "string",
70
+ "name": "marketName",
71
+ "type": "string"
72
+ },
140
73
  {
141
- "internalType": "address[]",
142
- "name": "",
143
- "type": "address[]"
74
+ "internalType": "enum MarketLib.MarketType",
75
+ "name": "marketType",
76
+ "type": "uint8"
144
77
  }
145
78
  ],
146
- "stateMutability": "view",
79
+ "name": "createMarket",
80
+ "outputs": [],
81
+ "stateMutability": "nonpayable",
147
82
  "type": "function"
148
83
  },
149
84
  {
150
- "inputs": [],
151
- "name": "marketName",
152
- "outputs": [
85
+ "inputs": [
153
86
  {
154
- "internalType": "string",
155
- "name": "",
156
- "type": "string"
87
+ "internalType": "uint32",
88
+ "name": "index",
89
+ "type": "uint32"
157
90
  }
158
91
  ],
159
- "stateMutability": "view",
92
+ "name": "destroyMarket",
93
+ "outputs": [],
94
+ "stateMutability": "nonpayable",
160
95
  "type": "function"
161
96
  },
162
97
  {
163
98
  "inputs": [],
164
- "name": "marketType",
99
+ "name": "getMarkets",
165
100
  "outputs": [
166
101
  {
167
- "internalType": "enum MarketLib.MarketType",
102
+ "internalType": "address[]",
168
103
  "name": "",
169
- "type": "uint8"
104
+ "type": "address[]"
170
105
  }
171
106
  ],
172
107
  "stateMutability": "view",
173
108
  "type": "function"
174
109
  },
175
110
  {
176
- "inputs": [
177
- {
178
- "internalType": "address",
179
- "name": "",
180
- "type": "address"
181
- },
111
+ "inputs": [],
112
+ "name": "getNumMarkets",
113
+ "outputs": [
182
114
  {
183
115
  "internalType": "uint256",
184
116
  "name": "",
185
117
  "type": "uint256"
186
118
  }
187
119
  ],
188
- "name": "relationshipsToOwner",
189
- "outputs": [
190
- {
191
- "internalType": "address",
192
- "name": "",
193
- "type": "address"
194
- }
195
- ],
196
120
  "stateMutability": "view",
197
121
  "type": "function"
198
122
  }
@@ -738,12 +662,12 @@
738
662
  "inputs": [
739
663
  {
740
664
  "internalType": "string",
741
- "name": "marketName",
665
+ "name": "_marketName",
742
666
  "type": "string"
743
667
  },
744
668
  {
745
669
  "internalType": "enum MarketLib.MarketType",
746
- "name": "marketType",
670
+ "name": "_marketType",
747
671
  "type": "uint8"
748
672
  }
749
673
  ],
@@ -807,32 +731,6 @@
807
731
  "name": "WorkRelationshipEnded",
808
732
  "type": "event"
809
733
  },
810
- {
811
- "inputs": [],
812
- "name": "_marketName",
813
- "outputs": [
814
- {
815
- "internalType": "string",
816
- "name": "",
817
- "type": "string"
818
- }
819
- ],
820
- "stateMutability": "view",
821
- "type": "function"
822
- },
823
- {
824
- "inputs": [],
825
- "name": "_marketType",
826
- "outputs": [
827
- {
828
- "internalType": "enum MarketLib.MarketType",
829
- "name": "",
830
- "type": "uint8"
831
- }
832
- ],
833
- "stateMutability": "view",
834
- "type": "function"
835
- },
836
734
  {
837
735
  "inputs": [
838
736
  {
@@ -861,6 +759,25 @@
861
759
  "stateMutability": "nonpayable",
862
760
  "type": "function"
863
761
  },
762
+ {
763
+ "inputs": [
764
+ {
765
+ "internalType": "uint256",
766
+ "name": "",
767
+ "type": "uint256"
768
+ }
769
+ ],
770
+ "name": "createdJobs",
771
+ "outputs": [
772
+ {
773
+ "internalType": "address",
774
+ "name": "",
775
+ "type": "address"
776
+ }
777
+ ],
778
+ "stateMutability": "view",
779
+ "type": "function"
780
+ },
864
781
  {
865
782
  "inputs": [],
866
783
  "name": "getNumJobs",
@@ -906,6 +823,32 @@
906
823
  "stateMutability": "view",
907
824
  "type": "function"
908
825
  },
826
+ {
827
+ "inputs": [],
828
+ "name": "marketName",
829
+ "outputs": [
830
+ {
831
+ "internalType": "string",
832
+ "name": "",
833
+ "type": "string"
834
+ }
835
+ ],
836
+ "stateMutability": "view",
837
+ "type": "function"
838
+ },
839
+ {
840
+ "inputs": [],
841
+ "name": "marketType",
842
+ "outputs": [
843
+ {
844
+ "internalType": "enum MarketLib.MarketType",
845
+ "name": "",
846
+ "type": "uint8"
847
+ }
848
+ ],
849
+ "stateMutability": "view",
850
+ "type": "function"
851
+ },
909
852
  {
910
853
  "inputs": [
911
854
  {
package/src/sync/process/process-log.ts CHANGED
@@ -31,18 +31,12 @@ function processLog(log) {
31
31
  function processLogEvents(log) {
32
32
  let event = null;
33
33
  let hash = null;
34
- console.log(abiMap)
35
34
  const { data, topics } = log;
36
35
  for (var i = 0; i < ABI_LIST.length; i++) {
37
36
  var abis = abiMap[ABI_LIST[i].toString()];
38
- console.log(ABI_LIST[i].toString())
39
- console.log('abis')
40
- console.log(abis)
41
37
  for (const aItem in abis) {
42
- console.log(aItem)
43
38
  if (aItem['type'] == "event") { continue; };
44
39
  var signature = abis[aItem]['name'] + "(" + abis[aItem]['inputs'].map(function (input) { return input.type; }).join(",") + ")";
45
- console.log('Processing an event with the signature: ' + signature)
46
40
  hash = utils.id(signature);
47
41
  if (hash == topics[0]) {
48
42
  event = abis[aItem];
@@ -52,11 +46,8 @@ function processLogEvents(log) {
52
46
  }
53
47
 
54
48
  if (event != null) {
55
- console.log('Event: ')
56
- console.log(event)
57
49
  switch(event['name']) {
58
50
  case "MarketCreated":
59
- console.log('MarketCreatedCase')
60
51
  processMarketCreatedEvent(log);
61
52
  break;
62
53
  case "MarketDestroyed":
package/src/sync/process/processWorkRelationshipCreated.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Contracts, ExchangeEvents, MarketEvents } from '../../constants';
2
- import * as abiMap from '../../blockchain/abi.json';
3
- import * as addressMap from '../../blockchain/addresses.json';
2
+ import abiMap from '../../blockchain/abi.json';
3
+ import addressMap from '../../blockchain/addresses.json';
4
4
  import opportunityService from '../../OpportunityService';
5
5
  import { Contract } from '@ethersproject/contracts';
6
6
  import { ethers } from 'ethers';