@iexec/web3mail 1.7.1 → 1.7.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateUniqueId.js","sourceRoot":"","sources":["../../src/utils/generateUniqueId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"generateUniqueId.js","sourceRoot":"","sources":["../../src/utils/generateUniqueId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAE9C,MAAM,UAAU,sBAAsB,CAAC,MAAM;IAC3C,OAAO,OAAO,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -71,7 +71,23 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
|
|
|
71
71
|
}
|
|
72
72
|
}
|
|
73
73
|
try {
|
|
74
|
-
|
|
74
|
+
// Fetch app order first to determine TEE framework
|
|
75
|
+
const apporder = await iexec.orderbook
|
|
76
|
+
.fetchAppOrderbook({
|
|
77
|
+
app: dappAddressOrENS,
|
|
78
|
+
minTag: ['tee'],
|
|
79
|
+
workerpool: workerpoolAddressOrEns,
|
|
80
|
+
})
|
|
81
|
+
.then((appOrderbook) => {
|
|
82
|
+
const desiredPriceAppOrderbook = appOrderbook.orders.filter((order) => order.order.appprice <= vAppMaxPrice);
|
|
83
|
+
const desiredPriceAppOrder = desiredPriceAppOrderbook[0]?.order;
|
|
84
|
+
if (!desiredPriceAppOrder) {
|
|
85
|
+
throw new Error('No App order found for the desired price');
|
|
86
|
+
}
|
|
87
|
+
return desiredPriceAppOrder;
|
|
88
|
+
});
|
|
89
|
+
const workerpoolMinTag = apporder.tag;
|
|
90
|
+
const [datasetorderForApp, datasetorderForWhitelist, workerpoolorder] = await Promise.all([
|
|
75
91
|
// Fetch dataset order for web3mail app
|
|
76
92
|
iexec.orderbook
|
|
77
93
|
.fetchDatasetOrderbook({
|
|
@@ -94,22 +110,6 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
|
|
|
94
110
|
const desiredPriceDataOrderbook = datasetOrderbook.orders.filter((order) => order.order.datasetprice <= vDataMaxPrice);
|
|
95
111
|
return desiredPriceDataOrderbook[0]?.order; // may be undefined
|
|
96
112
|
}),
|
|
97
|
-
// Fetch app order
|
|
98
|
-
iexec.orderbook
|
|
99
|
-
.fetchAppOrderbook({
|
|
100
|
-
app: dappAddressOrENS,
|
|
101
|
-
minTag: ['tee', 'scone'],
|
|
102
|
-
maxTag: ['tee', 'scone'],
|
|
103
|
-
workerpool: workerpoolAddressOrEns,
|
|
104
|
-
})
|
|
105
|
-
.then((appOrderbook) => {
|
|
106
|
-
const desiredPriceAppOrderbook = appOrderbook.orders.filter((order) => order.order.appprice <= vAppMaxPrice);
|
|
107
|
-
const desiredPriceAppOrder = desiredPriceAppOrderbook[0]?.order;
|
|
108
|
-
if (!desiredPriceAppOrder) {
|
|
109
|
-
throw new Error('No App order found for the desired price');
|
|
110
|
-
}
|
|
111
|
-
return desiredPriceAppOrder;
|
|
112
|
-
}),
|
|
113
113
|
// Fetch workerpool order for App or AppWhitelist
|
|
114
114
|
Promise.all([
|
|
115
115
|
// for app
|
|
@@ -119,8 +119,7 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
|
|
|
119
119
|
dataset: vDatasetAddress,
|
|
120
120
|
requester: requesterAddress, // public orders + user specific orders
|
|
121
121
|
isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
|
|
122
|
-
minTag:
|
|
123
|
-
maxTag: ['tee', 'scone'],
|
|
122
|
+
minTag: workerpoolMinTag,
|
|
124
123
|
category: 0,
|
|
125
124
|
}),
|
|
126
125
|
// for app whitelist
|
|
@@ -130,8 +129,7 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
|
|
|
130
129
|
dataset: vDatasetAddress,
|
|
131
130
|
requester: requesterAddress, // public orders + user specific orders
|
|
132
131
|
isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
|
|
133
|
-
minTag:
|
|
134
|
-
maxTag: ['tee', 'scone'],
|
|
132
|
+
minTag: workerpoolMinTag,
|
|
135
133
|
category: 0,
|
|
136
134
|
}),
|
|
137
135
|
]).then(([workerpoolOrderbookForApp, workerpoolOrderbookForAppWhitelist]) => {
|
|
@@ -195,7 +193,7 @@ export const sendEmail = async ({ graphQLClient = throwIfMissing(), iexec = thro
|
|
|
195
193
|
datasetmaxprice: datasetorder.datasetprice,
|
|
196
194
|
appmaxprice: apporder.appprice,
|
|
197
195
|
workerpoolmaxprice: workerpoolorder.workerpoolprice,
|
|
198
|
-
tag: ['tee'
|
|
196
|
+
tag: ['tee'],
|
|
199
197
|
workerpool: vWorkerpoolAddressOrEns,
|
|
200
198
|
callback: CALLBACK_WEB3MAIL,
|
|
201
199
|
params: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sendEmail.js","sourceRoot":"","sources":["../../src/web3mail/sendEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,2BAA2B,EAC3B,4BAA4B,EAC5B,kCAAkC,GACnC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AACtE,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,EACL,kBAAkB,EAClB,aAAa,EACb,aAAa,EACb,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,oBAAoB,EACpB,gBAAgB,EAChB,cAAc,GACf,MAAM,wBAAwB,CAAC;AAChC,OAAO,EACL,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,uBAAuB,CAAC;AAa/B,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,EAC9B,aAAa,GAAG,cAAc,EAAE,EAChC,KAAK,GAAG,cAAc,EAAE,EACxB,sBAAsB,EACtB,gBAAgB,EAChB,oBAAoB,EACpB,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,WAAW,GAAG,oBAAoB,EAClC,KAAK,EACL,YAAY,GAAG,4BAA4B,EAC3C,WAAW,GAAG,2BAA2B,EACzC,kBAAkB,GAAG,kCAAkC,EACvD,UAAU,EACV,aAAa,EACb,UAAU,GAAG,KAAK,GAOH,EAA8B,EAAE;IAC/C,MAAM,eAAe,GAAG,kBAAkB,EAAE;SACzC,QAAQ,EAAE;SACV,KAAK,CAAC,eAAe,CAAC;SACtB,YAAY,CAAC,aAAa,CAAC,CAAC;IAE/B,MAAM,aAAa,GAAG,kBAAkB,EAAE;SACvC,QAAQ,EAAE;SACV,KAAK,CAAC,cAAc,CAAC;SACrB,YAAY,CAAC,YAAY,CAAC,CAAC;IAE9B,MAAM,aAAa,GAAG,kBAAkB,EAAE;SACvC,QAAQ,EAAE;SACV,KAAK,CAAC,cAAc,CAAC;SACrB,YAAY,CAAC,YAAY,CAAC,CAAC;IAE9B,MAAM,YAAY,GAAG,iBAAiB,EAAE;SACrC,QAAQ,EAAE;SACV,KAAK,CAAC,aAAa,CAAC;SACpB,YAAY,CAAC,WAAW,CAAC,CAAC;IAE7B,MAAM,WAAW,GAAG,gBAAgB,EAAE;SACnC,KAAK,CAAC,YAAY,CAAC;SACnB,YAAY,CAAC,UAAU,CAAC,CAAC;IAE5B,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAEhE,MAAM,uBAAuB,GAAG,kBAAkB,EAAE;SACjD,QAAQ,EAAE;SACV,KAAK,CAAC,wBAAwB,CAAC;SAC/B,YAAY,CAAC,sBAAsB,CAAC,CAAC;IAExC,MAAM,iBAAiB,GAAG,kBAAkB,EAAE;SAC3C,QAAQ,EAAE;SACV,KAAK,CAAC,kBAAkB,CAAC;SACzB,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAElC,MAAM,qBAAqB,GAAG,aAAa,EAAE;SAC1C,QAAQ,EAAE;SACV,KAAK,CAAC,sBAAsB,CAAC;SAC7B,YAAY,CAAC,oBAAoB,CAAC,CAAC;IAEtC,MAAM,aAAa,GAAG,oBAAoB,EAAE;SACzC,KAAK,CAAC,cAAc,CAAC;SACrB,YAAY,CAAC,YAAY,CAAC,CAAC;IAE9B,MAAM,YAAY,GAAG,oBAAoB,EAAE;SACxC,KAAK,CAAC,aAAa,CAAC;SACpB,YAAY,CAAC,WAAW,CAAC,CAAC;IAE7B,MAAM,mBAAmB,GAAG,oBAAoB,EAAE;SAC/C,KAAK,CAAC,oBAAoB,CAAC;SAC3B,YAAY,CAAC,kBAAkB,CAAC,CAAC;IAEpC,MAAM,WAAW,GAAG,aAAa,EAAE;SAChC,KAAK,CAAC,YAAY,CAAC;SACnB,YAAY,CAAC,UAAU,CAAC,CAAC;IAE5B,+CAA+C;IAC/C,MAAM,oBAAoB,GAAG,MAAM,0BAA0B,CAC3D,aAAa,EACb,eAAe,CAChB,CAAC;IAEF,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CACb,oEAAoE,CACrE,CAAC;IACJ,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;IAEzD,IAAI,WAAW,CAAC;IAChB,IAAI,WAAW,EAAE,CAAC;QAChB,IAAI,CAAC;YACH,WAAW,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YACpE,gBAAgB,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QACpC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,8BAA8B,CAAC,EAAE,CAAC;gBAC7D,MAAM,IAAI,KAAK,CACb,iGAAiG,CAClG,CAAC;YACJ,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;IACH,CAAC;IAED,IAAI,CAAC;QACH,MAAM,
|
|
1
|
+
{"version":3,"file":"sendEmail.js","sourceRoot":"","sources":["../../src/web3mail/sendEmail.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@iexec/web3mail",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.3",
|
|
4
4
|
"description": "This product enables users to confidentially store data–such as mail address, documents, personal information ...",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"type": "module",
|
|
@@ -46,14 +46,12 @@
|
|
|
46
46
|
},
|
|
47
47
|
"homepage": "https://github.com/iExecBlockchainComputing/web3mail-sdk#readme",
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@
|
|
50
|
-
"@ethersproject/random": "^5.7.0",
|
|
51
|
-
"@iexec/dataprotector": "^2.0.0-beta.21",
|
|
49
|
+
"@iexec/dataprotector": "^2.0.0-beta.24",
|
|
52
50
|
"buffer": "^6.0.3",
|
|
53
|
-
"ethers": "^6.
|
|
51
|
+
"ethers": "^6.15.0",
|
|
54
52
|
"graphql-request": "^6.1.0",
|
|
55
|
-
"iexec": "^8.22.
|
|
56
|
-
"kubo-rpc-client": "^4.1
|
|
53
|
+
"iexec": "^8.22.5",
|
|
54
|
+
"kubo-rpc-client": "^5.4.1",
|
|
57
55
|
"yup": "^1.1.1"
|
|
58
56
|
},
|
|
59
57
|
"devDependencies": {
|
|
@@ -150,103 +150,99 @@ export const sendEmail = async ({
|
|
|
150
150
|
}
|
|
151
151
|
|
|
152
152
|
try {
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
.
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
const desiredPriceDataOrderbook = datasetOrderbook.orders.filter(
|
|
168
|
-
(order) => order.order.datasetprice <= vDataMaxPrice
|
|
169
|
-
);
|
|
170
|
-
return desiredPriceDataOrderbook[0]?.order; // may be undefined
|
|
171
|
-
}),
|
|
172
|
-
|
|
173
|
-
// Fetch dataset order for web3mail whitelist
|
|
174
|
-
iexec.orderbook
|
|
175
|
-
.fetchDatasetOrderbook({
|
|
176
|
-
dataset: vDatasetAddress,
|
|
177
|
-
app: vDappWhitelistAddress,
|
|
178
|
-
requester: requesterAddress,
|
|
179
|
-
})
|
|
180
|
-
.then((datasetOrderbook) => {
|
|
181
|
-
const desiredPriceDataOrderbook = datasetOrderbook.orders.filter(
|
|
182
|
-
(order) => order.order.datasetprice <= vDataMaxPrice
|
|
183
|
-
);
|
|
184
|
-
return desiredPriceDataOrderbook[0]?.order; // may be undefined
|
|
185
|
-
}),
|
|
186
|
-
|
|
187
|
-
// Fetch app order
|
|
188
|
-
iexec.orderbook
|
|
189
|
-
.fetchAppOrderbook({
|
|
190
|
-
app: dappAddressOrENS,
|
|
191
|
-
minTag: ['tee', 'scone'],
|
|
192
|
-
maxTag: ['tee', 'scone'],
|
|
193
|
-
workerpool: workerpoolAddressOrEns,
|
|
194
|
-
})
|
|
195
|
-
.then((appOrderbook) => {
|
|
196
|
-
const desiredPriceAppOrderbook = appOrderbook.orders.filter(
|
|
197
|
-
(order) => order.order.appprice <= vAppMaxPrice
|
|
198
|
-
);
|
|
199
|
-
const desiredPriceAppOrder = desiredPriceAppOrderbook[0]?.order;
|
|
200
|
-
if (!desiredPriceAppOrder) {
|
|
201
|
-
throw new Error('No App order found for the desired price');
|
|
202
|
-
}
|
|
203
|
-
return desiredPriceAppOrder;
|
|
204
|
-
}),
|
|
205
|
-
|
|
206
|
-
// Fetch workerpool order for App or AppWhitelist
|
|
207
|
-
Promise.all([
|
|
208
|
-
// for app
|
|
209
|
-
iexec.orderbook.fetchWorkerpoolOrderbook({
|
|
210
|
-
workerpool: workerpoolAddressOrEns,
|
|
211
|
-
app: vDappAddressOrENS,
|
|
212
|
-
dataset: vDatasetAddress,
|
|
213
|
-
requester: requesterAddress, // public orders + user specific orders
|
|
214
|
-
isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
|
|
215
|
-
minTag: ['tee', 'scone'],
|
|
216
|
-
maxTag: ['tee', 'scone'],
|
|
217
|
-
category: 0,
|
|
218
|
-
}),
|
|
219
|
-
// for app whitelist
|
|
220
|
-
iexec.orderbook.fetchWorkerpoolOrderbook({
|
|
221
|
-
workerpool: workerpoolAddressOrEns,
|
|
222
|
-
app: vDappWhitelistAddress,
|
|
223
|
-
dataset: vDatasetAddress,
|
|
224
|
-
requester: requesterAddress, // public orders + user specific orders
|
|
225
|
-
isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
|
|
226
|
-
minTag: ['tee', 'scone'],
|
|
227
|
-
maxTag: ['tee', 'scone'],
|
|
228
|
-
category: 0,
|
|
229
|
-
}),
|
|
230
|
-
]).then(
|
|
231
|
-
([workerpoolOrderbookForApp, workerpoolOrderbookForAppWhitelist]) => {
|
|
232
|
-
const desiredPriceWorkerpoolOrder = filterWorkerpoolOrders({
|
|
233
|
-
workerpoolOrders: [
|
|
234
|
-
...workerpoolOrderbookForApp.orders,
|
|
235
|
-
...workerpoolOrderbookForAppWhitelist.orders,
|
|
236
|
-
],
|
|
237
|
-
workerpoolMaxPrice: vWorkerpoolMaxPrice,
|
|
238
|
-
useVoucher: vUseVoucher,
|
|
239
|
-
userVoucher,
|
|
240
|
-
});
|
|
241
|
-
|
|
242
|
-
if (!desiredPriceWorkerpoolOrder) {
|
|
243
|
-
throw new Error('No Workerpool order found for the desired price');
|
|
244
|
-
}
|
|
245
|
-
|
|
246
|
-
return desiredPriceWorkerpoolOrder;
|
|
153
|
+
// Fetch app order first to determine TEE framework
|
|
154
|
+
const apporder = await iexec.orderbook
|
|
155
|
+
.fetchAppOrderbook({
|
|
156
|
+
app: dappAddressOrENS,
|
|
157
|
+
minTag: ['tee'],
|
|
158
|
+
workerpool: workerpoolAddressOrEns,
|
|
159
|
+
})
|
|
160
|
+
.then((appOrderbook) => {
|
|
161
|
+
const desiredPriceAppOrderbook = appOrderbook.orders.filter(
|
|
162
|
+
(order) => order.order.appprice <= vAppMaxPrice
|
|
163
|
+
);
|
|
164
|
+
const desiredPriceAppOrder = desiredPriceAppOrderbook[0]?.order;
|
|
165
|
+
if (!desiredPriceAppOrder) {
|
|
166
|
+
throw new Error('No App order found for the desired price');
|
|
247
167
|
}
|
|
248
|
-
|
|
249
|
-
|
|
168
|
+
return desiredPriceAppOrder;
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
const workerpoolMinTag = apporder.tag;
|
|
172
|
+
|
|
173
|
+
const [datasetorderForApp, datasetorderForWhitelist, workerpoolorder] =
|
|
174
|
+
await Promise.all([
|
|
175
|
+
// Fetch dataset order for web3mail app
|
|
176
|
+
iexec.orderbook
|
|
177
|
+
.fetchDatasetOrderbook({
|
|
178
|
+
dataset: vDatasetAddress,
|
|
179
|
+
app: dappAddressOrENS,
|
|
180
|
+
requester: requesterAddress,
|
|
181
|
+
})
|
|
182
|
+
.then((datasetOrderbook) => {
|
|
183
|
+
const desiredPriceDataOrderbook = datasetOrderbook.orders.filter(
|
|
184
|
+
(order) => order.order.datasetprice <= vDataMaxPrice
|
|
185
|
+
);
|
|
186
|
+
return desiredPriceDataOrderbook[0]?.order; // may be undefined
|
|
187
|
+
}),
|
|
188
|
+
|
|
189
|
+
// Fetch dataset order for web3mail whitelist
|
|
190
|
+
iexec.orderbook
|
|
191
|
+
.fetchDatasetOrderbook({
|
|
192
|
+
dataset: vDatasetAddress,
|
|
193
|
+
app: vDappWhitelistAddress,
|
|
194
|
+
requester: requesterAddress,
|
|
195
|
+
})
|
|
196
|
+
.then((datasetOrderbook) => {
|
|
197
|
+
const desiredPriceDataOrderbook = datasetOrderbook.orders.filter(
|
|
198
|
+
(order) => order.order.datasetprice <= vDataMaxPrice
|
|
199
|
+
);
|
|
200
|
+
return desiredPriceDataOrderbook[0]?.order; // may be undefined
|
|
201
|
+
}),
|
|
202
|
+
// Fetch workerpool order for App or AppWhitelist
|
|
203
|
+
Promise.all([
|
|
204
|
+
// for app
|
|
205
|
+
iexec.orderbook.fetchWorkerpoolOrderbook({
|
|
206
|
+
workerpool: workerpoolAddressOrEns,
|
|
207
|
+
app: vDappAddressOrENS,
|
|
208
|
+
dataset: vDatasetAddress,
|
|
209
|
+
requester: requesterAddress, // public orders + user specific orders
|
|
210
|
+
isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
|
|
211
|
+
minTag: workerpoolMinTag,
|
|
212
|
+
category: 0,
|
|
213
|
+
}),
|
|
214
|
+
// for app whitelist
|
|
215
|
+
iexec.orderbook.fetchWorkerpoolOrderbook({
|
|
216
|
+
workerpool: workerpoolAddressOrEns,
|
|
217
|
+
app: vDappWhitelistAddress,
|
|
218
|
+
dataset: vDatasetAddress,
|
|
219
|
+
requester: requesterAddress, // public orders + user specific orders
|
|
220
|
+
isRequesterStrict: useVoucher, // If voucher, we only want user specific orders
|
|
221
|
+
minTag: workerpoolMinTag,
|
|
222
|
+
category: 0,
|
|
223
|
+
}),
|
|
224
|
+
]).then(
|
|
225
|
+
([workerpoolOrderbookForApp, workerpoolOrderbookForAppWhitelist]) => {
|
|
226
|
+
const desiredPriceWorkerpoolOrder = filterWorkerpoolOrders({
|
|
227
|
+
workerpoolOrders: [
|
|
228
|
+
...workerpoolOrderbookForApp.orders,
|
|
229
|
+
...workerpoolOrderbookForAppWhitelist.orders,
|
|
230
|
+
],
|
|
231
|
+
workerpoolMaxPrice: vWorkerpoolMaxPrice,
|
|
232
|
+
useVoucher: vUseVoucher,
|
|
233
|
+
userVoucher,
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
if (!desiredPriceWorkerpoolOrder) {
|
|
237
|
+
throw new Error(
|
|
238
|
+
'No Workerpool order found for the desired price'
|
|
239
|
+
);
|
|
240
|
+
}
|
|
241
|
+
|
|
242
|
+
return desiredPriceWorkerpoolOrder;
|
|
243
|
+
}
|
|
244
|
+
),
|
|
245
|
+
]);
|
|
250
246
|
|
|
251
247
|
if (!workerpoolorder) {
|
|
252
248
|
throw new Error('No Workerpool order found for the desired price');
|
|
@@ -302,7 +298,7 @@ export const sendEmail = async ({
|
|
|
302
298
|
datasetmaxprice: datasetorder.datasetprice,
|
|
303
299
|
appmaxprice: apporder.appprice,
|
|
304
300
|
workerpoolmaxprice: workerpoolorder.workerpoolprice,
|
|
305
|
-
tag: ['tee'
|
|
301
|
+
tag: ['tee'],
|
|
306
302
|
workerpool: vWorkerpoolAddressOrEns,
|
|
307
303
|
callback: CALLBACK_WEB3MAIL,
|
|
308
304
|
params: {
|