@dcl/content-validator 7.1.0 → 7.1.1
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.
- package/dist/utils.d.ts +5 -0
- package/dist/utils.d.ts.map +1 -1
- package/dist/utils.js +15 -2
- package/dist/utils.js.map +1 -1
- package/dist/validations/access/on-chain/scenes.d.ts.map +1 -1
- package/dist/validations/access/on-chain/scenes.js +4 -0
- package/dist/validations/access/on-chain/scenes.js.map +1 -1
- package/dist/validations/access/subgraph/scenes.d.ts.map +1 -1
- package/dist/validations/access/subgraph/scenes.js +13 -6
- package/dist/validations/access/subgraph/scenes.js.map +1 -1
- package/dist/validations/entity-structure.js +4 -4
- package/dist/validations/entity-structure.js.map +1 -1
- package/dist/validations/outfits.d.ts.map +1 -1
- package/dist/validations/outfits.js +2 -2
- package/dist/validations/outfits.js.map +1 -1
- package/dist/validations/profile.d.ts.map +1 -1
- package/dist/validations/profile.js +7 -6
- package/dist/validations/profile.js.map +1 -1
- package/dist/validations/scene.d.ts.map +1 -1
- package/dist/validations/scene.js +2 -2
- package/dist/validations/scene.js.map +1 -1
- package/dist/validations/timestamps.d.ts +1 -1
- package/dist/validations/timestamps.d.ts.map +1 -1
- package/dist/validations/timestamps.js +17 -15
- package/dist/validations/timestamps.js.map +1 -1
- package/package.json +2 -2
package/dist/utils.d.ts
CHANGED
|
@@ -19,6 +19,11 @@ type URNsByNetwork = {
|
|
|
19
19
|
type: string;
|
|
20
20
|
}[];
|
|
21
21
|
};
|
|
22
|
+
/**
|
|
23
|
+
* Wraps parseUrn in a try-catch so callers don't need to handle thrown exceptions.
|
|
24
|
+
* Returns null if the URN cannot be parsed for any reason.
|
|
25
|
+
*/
|
|
26
|
+
export declare function safeParseUrn(urn: string): Promise<import("@dcl/urn-resolver").BlockchainAsset | import("@dcl/urn-resolver").OffChainAsset | import("@dcl/urn-resolver").EntityV3Asset | import("@dcl/urn-resolver").BlockchainCollectionV1Asset | import("@dcl/urn-resolver").BlockchainCollectionV1Item | import("@dcl/urn-resolver").BlockchainCollectionV2Asset | import("@dcl/urn-resolver").BlockchainCollectionV2Item | import("@dcl/urn-resolver").BlockchainCollectionV1 | import("@dcl/urn-resolver").BlockchainCollectionV2 | import("@dcl/urn-resolver").BlockchainCollectionThirdPartyName | import("@dcl/urn-resolver").BlockchainCollectionThirdPartyCollection | BlockchainCollectionThirdParty | import("@dcl/urn-resolver").BlockchainCollectionThirdPartyItem | null>;
|
|
22
27
|
export declare function splitItemsURNsByTypeAndNetwork(urnsToSplit: string[]): Promise<URNsByNetwork>;
|
|
23
28
|
export declare function getThirdPartyId(asset: BlockchainCollectionThirdParty): string;
|
|
24
29
|
export declare function toHexBuffer(value: string): Buffer;
|
package/dist/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,8BAA8B,EAAY,MAAM,mBAAmB,CAAA;AAG5E,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACzC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACtC,kBAAkB,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACnD,eAAe,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CACjD,CAAA;AAWD,wBAAsB,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAyClG;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,8BAA8B,GAAG,MAAM,CAE7E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKjD"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,8BAA8B,EAAY,MAAM,mBAAmB,CAAA;AAG5E,KAAK,aAAa,GAAG;IACnB,QAAQ,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACzC,KAAK,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACtC,kBAAkB,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;IACnD,eAAe,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAA;CACjD,CAAA;AAWD;;;GAGG;AACH,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,itBAM7C;AAED,wBAAsB,8BAA8B,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,aAAa,CAAC,CAyClG;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,8BAA8B,GAAG,MAAM,CAE7E;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKjD"}
|
package/dist/utils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.toHexBuffer = exports.getThirdPartyId = exports.splitItemsURNsByTypeAndNetwork = void 0;
|
|
3
|
+
exports.toHexBuffer = exports.getThirdPartyId = exports.splitItemsURNsByTypeAndNetwork = exports.safeParseUrn = void 0;
|
|
4
4
|
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
5
5
|
const types_1 = require("./types");
|
|
6
6
|
const ITEM_TYPES_TO_SPLIT = [
|
|
@@ -11,13 +11,26 @@ const ITEM_TYPES_TO_SPLIT = [
|
|
|
11
11
|
'blockchain-collection-third-party',
|
|
12
12
|
'blockchain-collection-third-party-item'
|
|
13
13
|
];
|
|
14
|
+
/**
|
|
15
|
+
* Wraps parseUrn in a try-catch so callers don't need to handle thrown exceptions.
|
|
16
|
+
* Returns null if the URN cannot be parsed for any reason.
|
|
17
|
+
*/
|
|
18
|
+
async function safeParseUrn(urn) {
|
|
19
|
+
try {
|
|
20
|
+
return await (0, urn_resolver_1.parseUrn)(urn);
|
|
21
|
+
}
|
|
22
|
+
catch {
|
|
23
|
+
return null;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
exports.safeParseUrn = safeParseUrn;
|
|
14
27
|
async function splitItemsURNsByTypeAndNetwork(urnsToSplit) {
|
|
15
28
|
const ethereum = [];
|
|
16
29
|
const matic = [];
|
|
17
30
|
const ethereumThirdParty = [];
|
|
18
31
|
const maticThirdParty = [];
|
|
19
32
|
for (const urn of urnsToSplit) {
|
|
20
|
-
const asset = await (
|
|
33
|
+
const asset = await safeParseUrn(urn);
|
|
21
34
|
if (!asset || !('network' in asset) || !ITEM_TYPES_TO_SPLIT.includes(asset.type)) {
|
|
22
35
|
continue;
|
|
23
36
|
}
|
package/dist/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAAA,oDAA4E;AAC5E,mCAAkD;AASlD,MAAM,mBAAmB,GAAG;IAC1B,gCAAgC;IAChC,+BAA+B;IAC/B,gCAAgC;IAChC,+BAA+B;IAC/B,mCAAmC;IACnC,wCAAwC;CACzC,CAAA;AAEM,KAAK,UAAU,8BAA8B,CAAC,WAAqB;IACxE,MAAM,QAAQ,GAAoC,EAAE,CAAA;IACpD,MAAM,KAAK,GAAoC,EAAE,CAAA;IACjD,MAAM,kBAAkB,GAAoC,EAAE,CAAA;IAC9D,MAAM,eAAe,GAAoC,EAAE,CAAA;IAE3D,KAAK,MAAM,GAAG,IAAI,WAAW,EAAE;QAC7B,MAAM,KAAK,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenes.d.ts","sourceRoot":"","sources":["../../../../src/validations/access/on-chain/scenes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAc,8BAA8B,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAErH;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,MAAM,EACN,EAAE,EACF,IAAI,EACL,EAAE,IAAI,CAAC,8BAA8B,EAAE,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC,gBAGpC,oBAAoB,KAAG,QAAQ,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"scenes.d.ts","sourceRoot":"","sources":["../../../../src/validations/access/on-chain/scenes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAc,8BAA8B,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAA;AAErH;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,MAAM,EACN,EAAE,EACF,IAAI,EACL,EAAE,IAAI,CAAC,8BAA8B,EAAE,eAAe,GAAG,MAAM,GAAG,QAAQ,GAAG,IAAI,CAAC,gBAGpC,oBAAoB,KAAG,QAAQ,kBAAkB,CAAC,CA2DhG"}
|
|
@@ -20,6 +20,10 @@ function createSceneValidateFn({ externalCalls, client, L1, logs }) {
|
|
|
20
20
|
if (pointerParts.length === 2) {
|
|
21
21
|
const x = parseInt(pointerParts[0], 10);
|
|
22
22
|
const y = parseInt(pointerParts[1], 10);
|
|
23
|
+
if (isNaN(x) || isNaN(y)) {
|
|
24
|
+
errors.push(`Scene pointers should only contain two integers separated by a comma, for example (10,10) or (120,-45). Invalid pointer: ${pointer}`);
|
|
25
|
+
continue;
|
|
26
|
+
}
|
|
23
27
|
batch.push([x, y]);
|
|
24
28
|
}
|
|
25
29
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenes.js","sourceRoot":"","sources":["../../../../src/validations/access/on-chain/scenes.ts"],"names":[],"mappings":";;;AAAA,0CAAqH;AAErH;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,MAAM,EACN,EAAE,EACF,IAAI,EAC6E;IACjF,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAA;IAExD,OAAO,KAAK,UAAU,UAAU,CAAC,UAAgC;QAC/D,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAC7B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;QAEtC,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAEnE,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;QAE1E,MAAM,KAAK,GAAuB,EAAE,CAAA;QAEpC,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;YACvC,MAAM,YAAY,GAAa,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACjD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,MAAM,CAAC,GAAW,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBAC/C,MAAM,CAAC,GAAW,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBAE/C,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;aACnB;iBAAM;gBACL,MAAM,CAAC,IAAI,CACT,4HAA4H,OAAO,EAAE,CACtI,CAAA;aACF;SACF;QAED,MAAM,EAAE,uBAAuB,EAAE,kCAAkC,EAAE,GAAG,MAAM,MAAM,CAAC,sBAAsB,CACzG,SAAS,EACT,EAAE,CAAC,WAAW,CACf,CAAA;QAED,IAAI;YACF,MAAM,aAAa,GAAG,uBAAuB;gBAC3C,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,uBAAuB,CAAC;gBACxE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;YAC1B,MAAM,0BAA0B,GAAG,kCAAkC;gBACnE,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,EAAE,kCAAkC,CAAC;gBACnF,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAA;YAE1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;gBACvB,MAAM,SAAS,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAA;gBACnE,IAAI,CAAC,SAAS,EAAE;oBACd,MAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iBAClG;aACF;SACF;QAAC,OAAO,GAAQ,EAAE;YACjB,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACjB,OAAO,IAAA,kBAAU,EAAC,4BAA4B,CAAC,CAAA;SAChD;QAED,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC,CAAA;AACH,CAAC;
|
|
1
|
+
{"version":3,"file":"scenes.js","sourceRoot":"","sources":["../../../../src/validations/access/on-chain/scenes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenes.d.ts","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/scenes.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAGpB,+BAA+B,EAC/B,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;AAgCvB;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,SAAS,EACT,IAAI,EACJ,cAAc,EACf,EAAE,IAAI,CAAC,+BAA+B,EAAE,eAAe,GAAG,MAAM,GAAG,WAAW,GAAG,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"scenes.d.ts","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/scenes.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EAGpB,+BAA+B,EAC/B,kBAAkB,EACnB,MAAM,gBAAgB,CAAA;AAgCvB;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,SAAS,EACT,IAAI,EACJ,cAAc,EACf,EAAE,IAAI,CAAC,+BAA+B,EAAE,eAAe,GAAG,MAAM,GAAG,WAAW,GAAG,gBAAgB,CAAC,gBAOpD,oBAAoB,KAAG,QAAQ,kBAAkB,CAAC,CA8UhG"}
|
|
@@ -14,9 +14,8 @@ const types_1 = require("../../../types");
|
|
|
14
14
|
function createSceneValidateFn({ externalCalls, subGraphs, logs, tokenAddresses }) {
|
|
15
15
|
const logger = logs.getLogger('scenes access validator');
|
|
16
16
|
const SCENE_LOOKBACK_TIME = (0, ms_1.default)('5m');
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
: 10;
|
|
17
|
+
const parsedConcurrency = parseInt(process.env.SCENE_VALIDATIONS_CONCURRENCY ?? '');
|
|
18
|
+
const SCENE_VALIDATIONS_CONCURRENCY = isNaN(parsedConcurrency) || parsedConcurrency <= 0 ? 10 : parsedConcurrency;
|
|
20
19
|
return async function validateFn(deployment) {
|
|
21
20
|
const getAuthorizations = async (owner, operator, timestamp, tokenAddress) => {
|
|
22
21
|
const query = `
|
|
@@ -183,9 +182,10 @@ function createSceneValidateFn({ externalCalls, subGraphs, logs, tokenAddresses
|
|
|
183
182
|
const estate = await getEstate(estateId.toString(), timestamp);
|
|
184
183
|
if (estate) {
|
|
185
184
|
return ((await hasAccessThroughFirstLevelAuthorities(estate, ethAddress)) ||
|
|
186
|
-
(
|
|
185
|
+
(estate.owners.length > 0 &&
|
|
186
|
+
(await hasAccessThroughAuthorizations(estate.owners[0].address, ethAddress, timestamp, tokenAddresses.estate))));
|
|
187
187
|
}
|
|
188
|
-
throw new Error(`Couldn\'t find the
|
|
188
|
+
throw new Error(`Couldn\'t find the estate ${estateId}`);
|
|
189
189
|
};
|
|
190
190
|
const isParcelUpdateAuthorized = async (x, y, timestamp, ethAddress, _externalCalls) => {
|
|
191
191
|
/* You get direct access if you were the:
|
|
@@ -198,7 +198,8 @@ function createSceneValidateFn({ externalCalls, subGraphs, logs, tokenAddresses
|
|
|
198
198
|
if (parcel) {
|
|
199
199
|
const belongsToEstate = parcel.estates !== undefined && parcel.estates.length > 0 && parcel.estates[0].estateId !== undefined;
|
|
200
200
|
return ((await hasAccessThroughFirstLevelAuthorities(parcel, ethAddress)) ||
|
|
201
|
-
(
|
|
201
|
+
(parcel.owners.length > 0 &&
|
|
202
|
+
(await hasAccessThroughAuthorizations(parcel.owners[0].address, ethAddress, timestamp, tokenAddresses.land))) ||
|
|
202
203
|
(belongsToEstate && (await isEstateUpdateAuthorized(parcel.estates[0].estateId, timestamp, ethAddress))));
|
|
203
204
|
}
|
|
204
205
|
throw new Error(`Parcel(${x},${y},${timestamp}) not found`);
|
|
@@ -224,6 +225,12 @@ function createSceneValidateFn({ externalCalls, subGraphs, logs, tokenAddresses
|
|
|
224
225
|
if (pointerParts.length === 2) {
|
|
225
226
|
const x = parseInt(pointerParts[0], 10);
|
|
226
227
|
const y = parseInt(pointerParts[1], 10);
|
|
228
|
+
if (isNaN(x) || isNaN(y)) {
|
|
229
|
+
errors.push(`Scene pointers should only contain two integers separated by a comma, for example (10,10) or (120,-45). Invalid pointer: ${pointer}`);
|
|
230
|
+
controller.abort();
|
|
231
|
+
queue.clear();
|
|
232
|
+
break;
|
|
233
|
+
}
|
|
227
234
|
// Check that the address has access (we check both the present and the 5 min into the past to avoid synchronization issues in the blockchain)
|
|
228
235
|
queue
|
|
229
236
|
.add(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scenes.js","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/scenes.ts"],"names":[],"mappings":";;;;;;AACA,4CAAmB;AACnB,sDAA4B;AAC5B,0CAMuB;AAgCvB;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,SAAS,EACT,IAAI,EACJ,cAAc,EACmF;IACjG,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAA;IAExD,MAAM,mBAAmB,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,CAAA;IACpC,MAAM,
|
|
1
|
+
{"version":3,"file":"scenes.js","sourceRoot":"","sources":["../../../../src/validations/access/subgraph/scenes.ts"],"names":[],"mappings":";;;;;;AACA,4CAAmB;AACnB,sDAA4B;AAC5B,0CAMuB;AAgCvB;;;GAGG;AACH,SAAgB,qBAAqB,CAAC,EACpC,aAAa,EACb,SAAS,EACT,IAAI,EACJ,cAAc,EACmF;IACjG,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,yBAAyB,CAAC,CAAA;IAExD,MAAM,mBAAmB,GAAG,IAAA,YAAE,EAAC,IAAI,CAAC,CAAA;IACpC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAA;IACnF,MAAM,6BAA6B,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,iBAAiB,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAA;IAEjH,OAAO,KAAK,UAAU,UAAU,CAAC,UAAgC;QAC/D,MAAM,iBAAiB,GAAG,KAAK,EAC7B,KAAiB,EACjB,QAAoB,EACpB,SAAoB,EACpB,YAAwB,EACE,EAAE;YAC5B,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;YAeR,CAAA;YAEN,MAAM,SAAS,GAAG;gBAChB,KAAK;gBACL,QAAQ;gBACR,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC;gBACvC,YAAY;aACb,CAAA;YAED,IAAI;gBACF,OAAO,CACL,MAAM,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAEjC,KAAK,EAAE,SAAS,CAAC,CACrB,CAAC,cAAc,CAAA;aACjB;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,CAAC,KAAK,CAAC,qCAAqC,KAAK,EAAE,CAAC,CAAA;gBAC1D,MAAM,KAAK,CAAA;aACZ;QACH,CAAC,CAAA;QAED,MAAM,SAAS,GAAG,KAAK,EAAE,QAAgB,EAAE,SAAoB,EAA+B,EAAE;YAC9F;;;;eAIG;YAEH,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YA6BR,CAAA;YAEN,MAAM,SAAS,GAAG;gBAChB,QAAQ;gBACR,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,OAAO;aAChD,CAAA;YAED,IAAI;gBACF,OAAO,CACL,MAAM,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAEjC,KAAK,EAAE,SAAS,CAAC,CACrB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;aACb;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,CAAC,KAAK,CAAC,0BAA0B,QAAQ,GAAG,CAAC,CAAA;gBACnD,MAAM,KAAK,CAAA;aACZ;QACH,CAAC,CAAA;QAED,MAAM,SAAS,GAAG,KAAK,EAAE,CAAS,EAAE,CAAS,EAAE,SAAoB,EAA+B,EAAE;YAClG;;;;eAIG;YAEH,MAAM,KAAK,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;YAoCR,CAAA;YAEN,MAAM,SAAS,GAAG;gBAChB,CAAC;gBACD,CAAC;gBACD,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,OAAO;aAChD,CAAA;YAED,IAAI;gBACF,MAAM,CAAC,GAAG,MAAM,SAAS,CAAC,EAAE,CAAC,WAAW,CAAC,KAAK,CAE3C,KAAK,EAAE,SAAS,CAAC,CAAA;gBAEpB,IAAI,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,OAAO,CAAC,MAAM;oBAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;gBAEtD,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;gBACtF,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,MAAM,SAAS,EAAE,CAAC,CAAA;aACpE;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,CAAC,KAAK,CAAC,0BAA0B,CAAC,KAAK,CAAC,KAAK,SAAS,GAAG,CAAC,CAAA;gBAChE,MAAM,KAAK,CAAA;aACZ;QACH,CAAC,CAAA;QAED,MAAM,8BAA8B,GAAG,KAAK,EAC1C,KAAiB,EACjB,UAAsB,EACtB,SAAoB,EACpB,YAAwB,EACN,EAAE;YACpB;;;eAGG;YACH,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAC5C,KAAK,CAAC,WAAW,EAAE,EACnB,UAAU,CAAC,WAAW,EAAE,EACxB,SAAS,EACT,YAAY,CAAC,WAAW,EAAE,CAC3B,CAAA;YAED,MAAM,0BAA0B,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YAC5G,MAAM,gCAAgC,GAAG,cAAc,CAAC,IAAI,CAC1D,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,KAAK,gBAAgB,CAC3D,CAAA;YACD,MAAM,+BAA+B,GAAG,cAAc,CAAC,IAAI,CACzD,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,KAAK,eAAe,CAC1D,CAAA;YAED,IACE,0BAA0B,EAAE,UAAU;gBACtC,gCAAgC,EAAE,UAAU;gBAC5C,+BAA+B,EAAE,UAAU,EAC3C;gBACA,OAAO,IAAI,CAAA;aACZ;YAED,OAAO,KAAK,CAAA;QACd,CAAC,CAAA;QAED,MAAM,qCAAqC,GAAG,KAAK,EACjD,MAA4B,EAC5B,UAAsB,EACJ,EAAE;YACpB,MAAM,qBAAqB,GAAG,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,MAAM,CAAC,SAAS,EAAE,GAAG,MAAM,CAAC,eAAe,CAAC;iBAC7F,MAAM,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC;iBACpD,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;YAClE,OAAO,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,CAAA;QACjE,CAAC,CAAA;QAED,MAAM,wBAAwB,GAAG,KAAK,EACpC,QAAgB,EAChB,SAAoB,EACpB,UAAsB,EACJ,EAAE;YACpB,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,SAAS,CAAC,CAAA;YAC9D,IAAI,MAAM,EAAE;gBACV,OAAO,CACL,CAAC,MAAM,qCAAqC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;oBACjE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;wBACvB,CAAC,MAAM,8BAA8B,CACnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EACxB,UAAU,EACV,SAAS,EACT,cAAc,CAAC,MAAM,CACtB,CAAC,CAAC,CACN,CAAA;aACF;YACD,MAAM,IAAI,KAAK,CAAC,6BAA6B,QAAQ,EAAE,CAAC,CAAA;QAC1D,CAAC,CAAA;QAED,MAAM,wBAAwB,GAAG,KAAK,EACpC,CAAS,EACT,CAAS,EACT,SAAoB,EACpB,UAAsB,EACtB,cAA6B,EACX,EAAE;YACpB;;;;;eAKG;YACH,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAA;YAC/C,IAAI,MAAM,EAAE;gBACV,MAAM,eAAe,GACnB,MAAM,CAAC,OAAO,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAA;gBAEvG,OAAO,CACL,CAAC,MAAM,qCAAqC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;oBACjE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;wBACvB,CAAC,MAAM,8BAA8B,CACnC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,EACxB,UAAU,EACV,SAAS,EACT,cAAc,CAAC,IAAI,CACpB,CAAC,CAAC;oBACL,CAAC,eAAe,IAAI,CAAC,MAAM,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CACzG,CAAA;aACF;YACD,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,aAAa,CAAC,CAAA;QAC7D,CAAC,CAAA;QAED,MAAM,iBAAiB,GAAG,KAAK,EAC7B,CAAS,EACT,CAAS,EACT,SAAoB,EACpB,UAAsB,EACtB,aAA4B,EACV,EAAE;YACpB,IAAI;gBACF,OAAO,MAAM,KAAK,CAAC,GAAG,EAAE,CAAC,wBAAwB,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAA;aAC1G;YAAC,OAAO,KAAK,EAAE;gBACd,MAAM,CAAC,KAAK,CAAC,iCAAiC,CAAC,KAAK,CAAC,KAAK,SAAS,KAAK,UAAU,IAAI,CAAC,CAAA;gBACvF,MAAM,KAAK,CAAA;aACZ;QACH,CAAC,CAAA;QAED,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAC7B,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,MAAM,CAAA;QACtC,MAAM,UAAU,GAAG,aAAa,CAAC,YAAY,CAAC,UAAU,CAAC,SAAS,CAAC,CAAA;QAEnE,MAAM,MAAM,GAAG,EAAE,CAAA;QACjB,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAA;QAE1E,MAAM,KAAK,GAAG,IAAI,iBAAM,CAAC,EAAE,WAAW,EAAE,6BAA6B,EAAE,CAAC,CAAA;QACxE,MAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAA;QAExC,KAAK,MAAM,OAAO,IAAI,iBAAiB,EAAE;YACvC,MAAM,YAAY,GAAa,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACjD,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC7B,MAAM,CAAC,GAAW,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBAC/C,MAAM,CAAC,GAAW,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBAE/C,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;oBACxB,MAAM,CAAC,IAAI,CACT,4HAA4H,OAAO,EAAE,CACtI,CAAA;oBACD,UAAU,CAAC,KAAK,EAAE,CAAA;oBAClB,KAAK,CAAC,KAAK,EAAE,CAAA;oBACb,MAAK;iBACN;gBAED,8IAA8I;gBAC9I,KAAK;qBACF,GAAG,CAAC,KAAK,IAAI,EAAE;oBACd,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE;wBAC9B,MAAM,SAAS,GACb,CAAC,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;4BACrE,CAAC,MAAM,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,GAAG,mBAAmB,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAA;wBAE7F,IAAI,CAAC,SAAS,EAAE;4BACd,MAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;4BACjG,UAAU,CAAC,KAAK,EAAE,CAAA;yBACnB;qBACF;gBACH,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,MAAM,CAAC,IAAI,CAAC,2EAA2E,CAAC,IAAI,CAAC,MAAM,KAAK,EAAE,CAAC,CAAA;oBAC3G,UAAU,CAAC,KAAK,EAAE,CAAA;gBACpB,CAAC,CAAC,CAAA;aACL;iBAAM;gBACL,MAAM,CAAC,IAAI,CACT,4HAA4H,OAAO,EAAE,CACtI,CAAA;gBACD,UAAU,CAAC,KAAK,EAAE,CAAA;aACnB;SACF;QAED,MAAM,KAAK,CAAC,MAAM,EAAE,CAAA;QAEpB,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC,CAAA;AACH,CAAC;AA1VD,sDA0VC;AAED,gBAAgB;AAChB,KAAK,UAAU,KAAK,CAClB,SAA2B,EAC3B,QAAgB,EAChB,WAAmB,IAAI,EACvB,qBAAsD;IAEtD,OAAO,QAAQ,GAAG,CAAC,EAAE;QACnB,IAAI;YACF,OAAO,MAAM,SAAS,EAAE,CAAA;YACxB,6EAA6E;YAC7E,wDAAwD;SACzD;QAAC,OAAO,KAAK,EAAE;YACd,QAAQ,EAAE,CAAA;YACV,IAAI,QAAQ,GAAG,CAAC,EAAE;gBAChB,IAAI,qBAAqB,EAAE;oBACzB,qBAAqB,CAAC,QAAQ,CAAC,CAAA;iBAChC;gBACD,MAAM,IAAI,OAAO,CAAO,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAA,YAAE,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;aAChE;iBAAM;gBACL,MAAM,KAAK,CAAA;aACZ;SACF;KACF;IACD,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAA;AAChF,CAAC"}
|
|
@@ -8,12 +8,12 @@ const types_1 = require("../types");
|
|
|
8
8
|
*/
|
|
9
9
|
async function entityStructureValidationFn(deployment) {
|
|
10
10
|
const { entity } = deployment;
|
|
11
|
-
if (
|
|
12
|
-
return (0, types_1.validationFailed)('There are repeated pointers in your request.');
|
|
13
|
-
}
|
|
14
|
-
else if (!entity.pointers || entity.pointers.length <= 0) {
|
|
11
|
+
if (!entity.pointers || entity.pointers.length <= 0) {
|
|
15
12
|
return (0, types_1.validationFailed)('The entity needs to be pointed by one or more pointers.');
|
|
16
13
|
}
|
|
14
|
+
else if (new Set(entity.pointers).size !== entity.pointers.length) {
|
|
15
|
+
return (0, types_1.validationFailed)('There are repeated pointers in your request.');
|
|
16
|
+
}
|
|
17
17
|
return types_1.OK;
|
|
18
18
|
}
|
|
19
19
|
exports.entityStructureValidationFn = entityStructureValidationFn;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity-structure.js","sourceRoot":"","sources":["../../src/validations/entity-structure.ts"],"names":[],"mappings":";;;AAAA,oCAAyF;AAEzF;;;GAGG;AACI,KAAK,UAAU,2BAA2B,CAAC,UAAgC;IAChF,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;IAC7B,IAAI,
|
|
1
|
+
{"version":3,"file":"entity-structure.js","sourceRoot":"","sources":["../../src/validations/entity-structure.ts"],"names":[],"mappings":";;;AAAA,oCAAyF;AAEzF;;;GAGG;AACI,KAAK,UAAU,2BAA2B,CAAC,UAAgC;IAChF,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;IAC7B,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;QACnD,OAAO,IAAA,wBAAgB,EAAC,yDAAyD,CAAC,CAAA;KACnF;SAAM,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;QACnE,OAAO,IAAA,wBAAgB,EAAC,8CAA8C,CAAC,CAAA;KACxE;IACD,OAAO,UAAE,CAAA;AACX,CAAC;AARD,kEAQC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outfits.d.ts","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"outfits.d.ts","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":"AACA,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EAEpB,UAAU,EACV,kBAAkB,EAEnB,MAAM,UAAU,CAAA;AAIjB,wBAAgB,8BAA8B,CAC5C,UAAU,EAAE,IAAI,CAAC,0BAA0B,EAAE,eAAe,CAAC,GAC5D,UAAU,CA4BZ;AAED,wBAAsB,mCAAmC,CACvD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAQ7B;AAED,wBAAsB,6CAA6C,CACjE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAO7B;AAED,wBAAsB,oDAAoD,CACxE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAO7B;AAED,eAAO,MAAM,mCAAmC,YA2B9C,CAAA;AAEF,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,0BAA0B,GAAG,UAAU,CAU1F"}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.createOutfitsValidateFn = exports.outfitsWearableUrnsIncludeTokenIdFn = exports.outfitsNumberOfNamesForExtraSlotsIsCorrectValidateFn = exports.outfitSlotsAreBetween0and9inclusiveValidateFn = exports.outfitSlotsAreNotRepeatedValidateFn = exports.createOutfitsPointerValidateFn = void 0;
|
|
4
4
|
const schemas_1 = require("@dcl/schemas");
|
|
5
|
-
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
6
5
|
const types_1 = require("../types");
|
|
6
|
+
const utils_1 = require("../utils");
|
|
7
7
|
const validations_1 = require("./validations");
|
|
8
8
|
function createOutfitsPointerValidateFn(components) {
|
|
9
9
|
return async function validateFn(deployment) {
|
|
@@ -67,7 +67,7 @@ exports.outfitsWearableUrnsIncludeTokenIdFn = (0, validations_1.validateAfterADR
|
|
|
67
67
|
const invalidUrns = [];
|
|
68
68
|
const nonItemUrns = [];
|
|
69
69
|
for (const wearableUrn of [...new Set(allWearables)]) {
|
|
70
|
-
const parsed = await (0,
|
|
70
|
+
const parsed = await (0, utils_1.safeParseUrn)(wearableUrn);
|
|
71
71
|
if (!parsed) {
|
|
72
72
|
invalidUrns.push(wearableUrn);
|
|
73
73
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"outfits.js","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":";;;AAAA,0CAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"outfits.js","sourceRoot":"","sources":["../../src/validations/outfits.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EAGpB,UAAU,EAEV,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAejB,eAAO,MAAM,UAAU,aAAc,MAAM,KAAG,OAAqC,CAAA;AAUnF,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,0BAA0B,cAgCnF;AAED,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyB1G;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvG;AAYD,wBAAsB,+BAA+B,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQnH;AAED,wBAAsB,oCAAoC,CACxD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAW7B;AAED,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,0BAA0B,cA0BnF;AAED,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAW7B;AAED;;;;;;GAMG;AACH,wBAAsB,uEAAuE,CAC3F,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAiB7B;AAED;;;;;GAKG;AACH,wBAAsB,4CAA4C,CAChE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAc7B;AAED;;;;GAIG;AACH,wBAAsB,yCAAyC,CAC7D,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,
|
|
1
|
+
{"version":3,"file":"profile.d.ts","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EAGpB,UAAU,EAEV,kBAAkB,EACnB,MAAM,UAAU,CAAA;AAejB,eAAO,MAAM,UAAU,aAAc,MAAM,KAAG,OAAqC,CAAA;AAUnF,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,0BAA0B,cAgCnF;AAED,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAyB1G;AAED,wBAAsB,mBAAmB,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA2BvG;AAYD,wBAAsB,+BAA+B,CAAC,UAAU,EAAE,oBAAoB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQnH;AAED,wBAAsB,oCAAoC,CACxD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAW7B;AAED,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAY7B;AAED,wBAAgB,6BAA6B,CAAC,UAAU,EAAE,0BAA0B,cA0BnF;AAED,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAW7B;AAED;;;;;;GAMG;AACH,wBAAsB,uEAAuE,CAC3F,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAiB7B;AAED;;;;;GAKG;AACH,wBAAsB,4CAA4C,CAChE,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAc7B;AAED;;;;GAIG;AACH,wBAAsB,yCAAyC,CAC7D,UAAU,EAAE,oBAAoB,GAC/B,OAAO,CAAC,kBAAkB,CAAC,CAe7B;AAED,wBAAgB,uBAAuB,CAAC,UAAU,EAAE,0BAA0B,GAAG,UAAU,CAqB1F"}
|
|
@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.createProfileValidateFn = exports.entityShouldNotHaveContentFilesValidateFn = exports.allMandatoryContentFilesArePresentValidateFn = exports.allContentFilesCorrespondToAtLeastOneAvatarSnapshotAfterADR45ValidateFn = exports.profileMustNotHaveSnapshotsValidateFn = exports.createProfileImagesValidateFn = exports.profileWearablesNotRepeatedValidateFn = exports.profileSlotsAreNotRepeatedValidateFn = exports.profileMustHaveEmotesValidateFn = exports.emoteUrnsValidateFn = exports.wearableUrnsValidateFn = exports.createFaceThumbnailValidateFn = exports.isOldEmote = void 0;
|
|
7
7
|
const schemas_1 = require("@dcl/schemas");
|
|
8
|
-
const urn_resolver_1 = require("@dcl/urn-resolver");
|
|
9
8
|
const sharp_1 = __importDefault(require("sharp"));
|
|
9
|
+
const utils_1 = require("../utils");
|
|
10
10
|
const types_1 = require("../types");
|
|
11
11
|
const timestamps_1 = require("./timestamps");
|
|
12
12
|
const validations_1 = require("./validations");
|
|
@@ -61,7 +61,7 @@ async function wearableUrnsValidateFn(deployment) {
|
|
|
61
61
|
for (const pointer of avatar.avatar.wearables) {
|
|
62
62
|
if ((0, exports.isOldEmote)(pointer))
|
|
63
63
|
continue;
|
|
64
|
-
const parsed = await (0,
|
|
64
|
+
const parsed = await (0, utils_1.safeParseUrn)(pointer);
|
|
65
65
|
if (!parsed) {
|
|
66
66
|
return (0, types_1.validationFailed)(`Each profile wearable pointer should be a urn, for example (urn:decentraland:{protocol}:collections-v2:{contract(0x[a-fA-F0-9]+)}:{name}). Invalid pointer: (${pointer})`);
|
|
67
67
|
}
|
|
@@ -85,7 +85,7 @@ async function emoteUrnsValidateFn(deployment) {
|
|
|
85
85
|
for (const { slot, urn } of allEmotes) {
|
|
86
86
|
if ((0, exports.isOldEmote)(urn))
|
|
87
87
|
continue;
|
|
88
|
-
const parsed = await (0,
|
|
88
|
+
const parsed = await (0, utils_1.safeParseUrn)(urn);
|
|
89
89
|
if (!parsed)
|
|
90
90
|
return (0, types_1.validationFailed)(`Each profile emote pointer should be a urn, for example (urn:decentraland:{protocol}:collections-v2:{contract(0x[a-fA-F0-9]+)}:{name}). Invalid pointer: (${urn})`);
|
|
91
91
|
if (deployment.entity.timestamp >= timestamps_1.ADR_244_TIMESTAMP) {
|
|
@@ -219,7 +219,7 @@ async function allMandatoryContentFilesArePresentValidateFn(deployment) {
|
|
|
219
219
|
async function validateFn(deployment) {
|
|
220
220
|
const { entity } = deployment;
|
|
221
221
|
const errors = [];
|
|
222
|
-
const fileNames = entity.content.map((a) => a.file.toLowerCase());
|
|
222
|
+
const fileNames = (entity.content ?? []).map((a) => a.file.toLowerCase());
|
|
223
223
|
if (!fileNames.includes('body.png')) {
|
|
224
224
|
errors.push(`Profile entity is missing file 'body.png'`);
|
|
225
225
|
}
|
|
@@ -240,8 +240,9 @@ async function entityShouldNotHaveContentFilesValidateFn(deployment) {
|
|
|
240
240
|
async function validateFn(deployment) {
|
|
241
241
|
const { entity } = deployment;
|
|
242
242
|
const errors = [];
|
|
243
|
-
|
|
244
|
-
|
|
243
|
+
const contentFiles = entity.content ?? [];
|
|
244
|
+
if (contentFiles.length > 0) {
|
|
245
|
+
errors.push(`Entity has content files when it should not: ${contentFiles.map((a) => a.file).join(', ')}`);
|
|
245
246
|
}
|
|
246
247
|
if (deployment.files.size > 1) {
|
|
247
248
|
errors.push(`Entity has uploaded files when it should not: ${Array.from(deployment.files.keys()).join(', ')}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"profile.js","sourceRoot":"","sources":["../../src/validations/profile.ts"],"names":[],"mappings":";;;;;;AAAA,0CAA0D;AAC1D,kDAAyB;AACzB,oCAAuC;AACvC,oCAQiB;AACjB,6CAAqF;AACrF,+CAQsB;AAEtB,0FAA0F;AAC1F,MAAM,oBAAoB,GAAG,GAAG,CAAA;AAEzB,MAAM,UAAU,GAAG,CAAC,QAAgB,EAAW,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;AAAtE,QAAA,UAAU,cAA4D;AAEnF,SAAS,sBAAsB,CAAC,QAAgB,EAAE,IAAY,EAAE,QAAiB;IAC/E,MAAM,wBAAwB,GAAG,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAA;IAEjE,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAc,EAAE,EAAE,CAC9C,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,wBAAwB,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CACrH,CAAA;AACH,CAAC;AAED,SAAgB,6BAA6B,CAAC,UAAsC;IAClF,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,UAAU,GAAU,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;QAEnE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAA;YAC9C,IAAI,CAAC,IAAI;gBAAE,OAAO,IAAA,wBAAgB,EAAC,oEAAoE,CAAC,CAAA;YAExG,MAAM,eAAe,GAAG,CAAC,MAAM,UAAU,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,CAAA;YAC1G,IAAI,eAAe,EAAE;gBACnB,OAAO,UAAE,CAAA;aACV;YACD,aAAa;YACb,MAAM,eAAe,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,CAAC,eAAe;gBAAE,OAAO,IAAA,wBAAgB,EAAC,2CAA2C,IAAI,EAAE,CAAC,CAAA;YAChG,IAAI;gBACF,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,eAAK,EAAC,eAAe,CAAC,CAAC,QAAQ,EAAE,CAAA;gBACzE,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,KAAK;oBAAE,MAAM,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAA;gBAC/G,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE;oBACrB,MAAM,CAAC,IAAI,CAAC,qDAAqD,CAAC,CAAA;iBACnE;qBAAM,IAAI,KAAK,KAAK,oBAAoB,IAAI,MAAM,KAAK,oBAAoB,EAAE;oBAC5E,MAAM,CAAC,IAAI,CAAC,iDAAiD,KAAK,eAAe,MAAM,GAAG,CAAC,CAAA;iBAC5F;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,MAAM,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAA;aAC5E;SACF;QACD,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,IAAA,oDAAsC,EAAC,6BAAgB,EAAE,UAAU,CAAC,CAAA;AAC7E,CAAC;AAhCD,sEAgCC;AAEM,KAAK,UAAU,sBAAsB,CAAC,UAAgC;IAC3E,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,UAAU,GAAU,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;QACnE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,KAAK,MAAM,OAAO,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE;gBAC7C,IAAI,IAAA,kBAAU,EAAC,OAAO,CAAC;oBAAE,SAAQ;gBAEjC,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAA;gBAC1C,IAAI,CAAC,MAAM,EAAE;oBACX,OAAO,IAAA,wBAAgB,EACrB,gKAAgK,OAAO,GAAG,CAC3K,CAAA;iBACF;gBACD,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,8BAAiB,EAAE;oBACpD,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAgC,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAgC,EAAE;wBACxG,OAAO,IAAA,wBAAgB,EACrB,oBAAoB,OAAO,qEAAqE,CACjG,CAAA;qBACF;iBACF;aACF;SACF;QACD,OAAO,UAAE,CAAA;IACX,CAAC;IACD,OAAO,IAAA,gCAAkB,EAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACnD,CAAC;AAzBD,wDAyBC;AAEM,KAAK,UAAU,mBAAmB,CAAC,UAAgC;IACxE,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;QAC5D,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAA;YAC5C,KAAK,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,IAAI,SAAS,EAAE;gBACrC,IAAI,IAAA,kBAAU,EAAC,GAAG,CAAC;oBAAE,SAAQ;gBAC7B,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,GAAG,CAAC,CAAA;gBACtC,IAAI,CAAC,MAAM;oBACT,OAAO,IAAA,wBAAgB,EACrB,6JAA6J,GAAG,GAAG,CACpK,CAAA;gBACH,IAAI,UAAU,CAAC,MAAM,CAAC,SAAS,IAAI,8BAAiB,EAAE;oBACpD,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAgC,IAAI,MAAM,CAAC,IAAI,KAAK,gCAAgC,EAAE;wBACxG,OAAO,IAAA,wBAAgB,EACrB,iBAAiB,GAAG,qEAAqE,CAC1F,CAAA;qBACF;iBACF;gBACD,IAAI,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,EAAE;oBACxB,OAAO,IAAA,wBAAgB,EAAC,YAAY,IAAI,iBAAiB,GAAG,gDAAgD,CAAC,CAAA;iBAC9G;aACF;SACF;QACD,OAAO,UAAE,CAAA;IACX,CAAC;IACD,OAAO,IAAA,gCAAkB,EAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACnD,CAAC;AA3BD,kDA2BC;AAED,SAAS,gBAAgB,CAAC,UAAgC;IACxD,MAAM,UAAU,GAAa,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;IACtE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;QAC/B,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE;YACzB,OAAO,IAAI,CAAA;SACZ;KACF;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAEM,KAAK,UAAU,+BAA+B,CAAC,UAAgC;IACpF,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,IAAI,CAAC,gBAAgB,CAAC,UAAU,CAAC,EAAE;YACjC,OAAO,IAAA,wBAAgB,EAAC,wCAAwC,CAAC,CAAA;SAClE;QACD,OAAO,UAAE,CAAA;IACX,CAAC;IACD,OAAO,IAAA,gCAAkB,EAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACnD,CAAC;AARD,0EAQC;AAEM,KAAK,UAAU,oCAAoC,CACxD,UAAgC;IAEhC,MAAM,UAAU,GAAa,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;IACtE,MAAM,SAAS,GAAuB,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAA;IAChG,MAAM,SAAS,GAAG,IAAI,GAAG,EAAE,CAAA;IAC3B,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,SAAS,EAAE;QAChC,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO,IAAA,wBAAgB,EAAC,cAAc,IAAI,0BAA0B,CAAC,CAAA;SACtE;QACD,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;KACpB;IACD,OAAO,UAAE,CAAA;AACX,CAAC;AAbD,oFAaC;AAEM,KAAK,UAAU,qCAAqC,CACzD,UAAgC;IAEhC,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,UAAU,GAAa,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;QACtE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAA;YACzC,IAAI,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,EAAE;gBAChD,OAAO,IAAA,wBAAgB,EAAC,mCAAmC,CAAC,CAAA;aAC7D;SACF;QACD,OAAO,UAAE,CAAA;IACX,CAAC;IACD,OAAO,IAAA,iCAAmB,EAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACpD,CAAC;AAdD,sFAcC;AAED,SAAgB,6BAA6B,CAAC,UAAsC;IAClF,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,UAAU,GAAU,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;QAEnE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAA;YAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,CAAA;YAE/C,IAAI,CAAC,QAAQ,IAAI,CAAC,QAAQ;gBACxB,OAAO,IAAA,wBAAgB,EAAC,oEAAoE,CAAC,CAAA;YAE/F,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,aAAa,CAAC,oBAAoB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;YAE9F,sBAAsB;YACtB,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAC9D,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,CAAC,cAAc,CAAC,EAAE;oBACnC,MAAM,CAAC,IAAI,CAAC,8CAA8C,GAAG,YAAY,KAAK,CAAC,cAAc,EAAE,CAAC,CAAA;iBACjG;YACH,CAAC,CAAC,CAAA;SACH;QAED,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,IAAA,oDAAsC,EAAC,6BAAgB,EAAE,UAAU,CAAC,CAAA;AAC7E,CAAC;AA1BD,sEA0BC;AAEM,KAAK,UAAU,qCAAqC,CACzD,UAAgC;IAEhC,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,UAAU,GAAa,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,IAAI,EAAE,CAAA;QACtE,KAAK,MAAM,MAAM,IAAI,UAAU,EAAE;YAC/B,IAAI,MAAM,CAAC,MAAM,EAAE,SAAS,EAAE;gBAC5B,OAAO,IAAA,wBAAgB,EAAC,kCAAkC,CAAC,CAAA;aAC5D;SACF;QACD,OAAO,UAAE,CAAA;IACX,CAAC;IACD,OAAO,IAAA,kDAAoC,EAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACrE,CAAC;AAbD,sFAaC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,uEAAuE,CAC3F,UAAgC;IAEhC,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE;YACjD,wEAAwE;YACxE,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,KAAK,CAAC,EAAE;gBACzF,MAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;aACrD;iBAAM,IAAI,CAAC,sBAAsB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE;gBAC/D,MAAM,CAAC,IAAI,CACT,+BAA+B,IAAI,8BAA8B,IAAI,+CAA+C,CACrH,CAAA;aACF;SACF;QACD,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC;IACD,OAAO,IAAA,oDAAsC,EAAC,6BAAgB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACzF,CAAC;AAnBD,0JAmBC;AAED;;;;;GAKG;AACI,KAAK,UAAU,4CAA4C,CAChE,UAAgC;IAEhC,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,SAAS,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;QACzE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE;YACnC,MAAM,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAA;SACzD;QACD,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAA;SAC5D;QACD,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC;IACD,OAAO,IAAA,oDAAsC,EAAC,8BAAiB,EAAE,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AAC1F,CAAC;AAhBD,oGAgBC;AAED;;;;GAIG;AACI,KAAK,UAAU,yCAAyC,CAC7D,UAAgC;IAEhC,KAAK,UAAU,UAAU,CAAC,UAAgC;QACxD,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAA;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAA;QAC3B,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,IAAI,EAAE,CAAA;QACzC,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,gDAAgD,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SAC1G;QACD,IAAI,UAAU,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,iDAAiD,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;SAC/G;QACD,OAAO,IAAA,kBAAU,EAAC,GAAG,MAAM,CAAC,CAAA;IAC9B,CAAC;IAED,OAAO,IAAA,kDAAoC,EAAC,UAAU,CAAC,CAAC,UAAU,CAAC,CAAA;AACrE,CAAC;AAjBD,8FAiBC;AAED,SAAgB,uBAAuB,CAAC,UAAsC;IAC5E;;;OAGG;IACH,OAAO,IAAA,mCAAqB,EAC1B,oBAAU,CAAC,OAAO,EAClB,IAAA,yBAAW,EACT,qCAAqC,EACrC,6BAA6B,CAAC,UAAU,CAAC,EACzC,6BAA6B,CAAC,UAAU,CAAC,EACzC,sBAAsB,EACtB,mBAAmB,EACnB,+BAA+B,EAC/B,oCAAoC,EACpC,qCAAqC,EACrC,uEAAuE,EACvE,4CAA4C,EAC5C,yCAAyC,CAC1C,CACF,CAAA;AACH,CAAC;AArBD,0DAqBC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../src/validations/scene.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,+BAA+B,+BAW1C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,+
|
|
1
|
+
{"version":3,"file":"scene.d.ts","sourceRoot":"","sources":["../../src/validations/scene.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,eAAO,MAAM,+BAA+B,+BAW1C,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,+BAa5B,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,eAAe,+BAG3B,CAAA"}
|
|
@@ -22,9 +22,9 @@ exports.noWorldsConfigurationValidateFn = (0, validations_1.validateAfterADR173)
|
|
|
22
22
|
* @public
|
|
23
23
|
*/
|
|
24
24
|
exports.embeddedThumbnail = (0, validations_1.validateAfterADR236)(async function validateFn(deployment) {
|
|
25
|
-
const sceneThumbnail = deployment.entity.metadata?.display
|
|
25
|
+
const sceneThumbnail = deployment.entity.metadata?.display?.navmapThumbnail;
|
|
26
26
|
if (sceneThumbnail) {
|
|
27
|
-
const isFilePresent = deployment.entity.content.some((content) => content.file === sceneThumbnail);
|
|
27
|
+
const isFilePresent = (deployment.entity.content ?? []).some((content) => content.file === sceneThumbnail);
|
|
28
28
|
if (!isFilePresent) {
|
|
29
29
|
return (0, types_1.validationFailed)(`Scene thumbnail '${sceneThumbnail}' must be a file included in the deployment.`);
|
|
30
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scene.js","sourceRoot":"","sources":["../../src/validations/scene.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,oCAAyF;AACzF,+CAA4G;AAE5G;;;GAGG;AACU,QAAA,+BAA+B,GAAG,IAAA,iCAAmB,EAAC,KAAK,UAAU,UAAU,CAC1F,UAAgC;IAEhC,MAAM,0BAA0B,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,KAAK,SAAS,CAAA;IAC/F,IAAI,0BAA0B,EAAE;QAC9B,OAAO,IAAA,wBAAgB;QACrB,qBAAqB;QACrB,4LAA4L,CAC7L,CAAA;KACF;IACD,OAAO,UAAE,CAAA;AACX,CAAC,CAAC,CAAA;AAEF;;;GAGG;AACU,QAAA,iBAAiB,GAAG,IAAA,iCAAmB,EAAC,KAAK,UAAU,UAAU,CAC5E,UAAgC;IAEhC,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,
|
|
1
|
+
{"version":3,"file":"scene.js","sourceRoot":"","sources":["../../src/validations/scene.ts"],"names":[],"mappings":";;;AAAA,0CAAyD;AACzD,oCAAyF;AACzF,+CAA4G;AAE5G;;;GAGG;AACU,QAAA,+BAA+B,GAAG,IAAA,iCAAmB,EAAC,KAAK,UAAU,UAAU,CAC1F,UAAgC;IAEhC,MAAM,0BAA0B,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,kBAAkB,KAAK,SAAS,CAAA;IAC/F,IAAI,0BAA0B,EAAE;QAC9B,OAAO,IAAA,wBAAgB;QACrB,qBAAqB;QACrB,4LAA4L,CAC7L,CAAA;KACF;IACD,OAAO,UAAE,CAAA;AACX,CAAC,CAAC,CAAA;AAEF;;;GAGG;AACU,QAAA,iBAAiB,GAAG,IAAA,iCAAmB,EAAC,KAAK,UAAU,UAAU,CAC5E,UAAgC;IAEhC,MAAM,cAAc,GAAG,UAAU,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAA;IAC3E,IAAI,cAAc,EAAE;QAClB,MAAM,aAAa,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAC1D,CAAC,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,cAAc,CAC7D,CAAA;QACD,IAAI,CAAC,aAAa,EAAE;YAClB,OAAO,IAAA,wBAAgB,EAAC,oBAAoB,cAAc,8CAA8C,CAAC,CAAA;SAC1G;KACF;IACD,OAAO,UAAE,CAAA;AACX,CAAC,CAAC,CAAA;AAEF;;;GAGG;AACU,QAAA,eAAe,GAAG,IAAA,mCAAqB,EAClD,oBAAU,CAAC,KAAK,EAChB,IAAA,yBAAW,EAAC,uCAA+B,EAAE,yBAAiB,CAAC,CAChE,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timestamps.d.ts","sourceRoot":"","sources":["../../src/validations/timestamps.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"timestamps.d.ts","sourceRoot":"","sources":["../../src/validations/timestamps.ts"],"names":[],"mappings":"AAMA;;;GAGG;AACH,eAAO,MAAM,gBAAgB,QAA8D,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,gBAAgB,QAA8D,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,gBAAgB,QAA8D,CAAA;AAE3F;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAA+D,CAAA;AAE7F;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAA+D,CAAA;AAE7F;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAA+D,CAAA;AAE7F;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAA+D,CAAA;AAE7F;;;GAGG;AACH,eAAO,MAAM,iBAAiB,QAA+D,CAAA;AAI7F;;;GAGG;AACH,eAAO,MAAM,0BAA0B,QAA+D,CAAA;AAEtG,eAAO,MAAM,0BAA0B,QAGtC,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,kCAAkC,gBAAgB,CAAA"}
|
|
@@ -1,57 +1,59 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.LEGACY_CONTENT_MIGRATION_TIMESTAMP = exports.ADR_290_REJECTED_TIMESTAMP = exports.ADR_290_OPTIONAL_TIMESTAMP = exports.ADR_244_TIMESTAMP = exports.ADR_236_TIMESTAMP = exports.ADR_232_TIMESTAMP = exports.ADR_173_TIMESTAMP = exports.ADR_158_TIMESTAMP = exports.ADR_74_TIMESTAMP = exports.ADR_75_TIMESTAMP = exports.ADR_45_TIMESTAMP = void 0;
|
|
4
|
+
function parseTimestamp(envVar, defaultValue) {
|
|
5
|
+
if (!envVar)
|
|
6
|
+
return defaultValue;
|
|
7
|
+
const parsed = parseInt(envVar);
|
|
8
|
+
return isNaN(parsed) ? defaultValue : parsed;
|
|
9
|
+
}
|
|
4
10
|
/**
|
|
5
11
|
* 1652191200000 = 2022-05-10T14:00:00Z
|
|
6
12
|
* @public
|
|
7
13
|
*/
|
|
8
|
-
exports.ADR_45_TIMESTAMP =
|
|
14
|
+
exports.ADR_45_TIMESTAMP = parseTimestamp(process.env.ADR_45_TIMESTAMP, 1652191200000);
|
|
9
15
|
/**
|
|
10
16
|
* 1658275200000 = 2022-07-20T00:00:00Z
|
|
11
17
|
* @public
|
|
12
18
|
*/
|
|
13
|
-
exports.ADR_75_TIMESTAMP =
|
|
19
|
+
exports.ADR_75_TIMESTAMP = parseTimestamp(process.env.ADR_75_TIMESTAMP, 1658275200000);
|
|
14
20
|
/**
|
|
15
|
-
*
|
|
21
|
+
* 1662987600000 = 2022-09-12T13:00:00Z
|
|
16
22
|
* @public
|
|
17
23
|
*/
|
|
18
|
-
exports.ADR_74_TIMESTAMP =
|
|
24
|
+
exports.ADR_74_TIMESTAMP = parseTimestamp(process.env.ADR_74_TIMESTAMP, 1662987600000);
|
|
19
25
|
/**
|
|
20
26
|
* 1674576000000 = 2023-01-24T15:00:00Z
|
|
21
27
|
* @public
|
|
22
28
|
*/
|
|
23
|
-
exports.ADR_158_TIMESTAMP =
|
|
29
|
+
exports.ADR_158_TIMESTAMP = parseTimestamp(process.env.ADR_158_TIMESTAMP, 1674576000000);
|
|
24
30
|
/**
|
|
25
31
|
* 1673967600000 = 2023-01-17T15:00:00Z
|
|
26
32
|
* @public
|
|
27
33
|
*/
|
|
28
|
-
exports.ADR_173_TIMESTAMP =
|
|
34
|
+
exports.ADR_173_TIMESTAMP = parseTimestamp(process.env.ADR_173_TIMESTAMP, 1673967600000);
|
|
29
35
|
/**
|
|
30
36
|
* 1686571200000 = 2023-06-12T12:00:00Z
|
|
31
37
|
* @public
|
|
32
38
|
*/
|
|
33
|
-
exports.ADR_232_TIMESTAMP =
|
|
39
|
+
exports.ADR_232_TIMESTAMP = parseTimestamp(process.env.ADR_232_TIMESTAMP, 1686571200000);
|
|
34
40
|
/**
|
|
35
41
|
* 1684497600000 = 2023-05-19T12:00:00Z
|
|
36
42
|
* @public
|
|
37
43
|
*/
|
|
38
|
-
exports.ADR_236_TIMESTAMP =
|
|
44
|
+
exports.ADR_236_TIMESTAMP = parseTimestamp(process.env.ADR_236_TIMESTAMP, 1684497600000);
|
|
39
45
|
/**
|
|
40
46
|
* 1710428400000 = 2024-03-14T15:00:00Z
|
|
41
47
|
* @public
|
|
42
48
|
*/
|
|
43
|
-
exports.ADR_244_TIMESTAMP =
|
|
49
|
+
exports.ADR_244_TIMESTAMP = parseTimestamp(process.env.ADR_244_TIMESTAMP, 1710428400000);
|
|
44
50
|
const THREE_MONTHS_IN_MS = 3 * 30 * 24 * 60 * 60 * 1000;
|
|
45
51
|
/**
|
|
46
52
|
* 1762743600000 = 2025-11-10T00:00:00Z
|
|
47
53
|
* @public
|
|
48
54
|
*/
|
|
49
|
-
exports.ADR_290_OPTIONAL_TIMESTAMP = process.env.ADR_290_TIMESTAMP
|
|
50
|
-
|
|
51
|
-
: 1762743600000;
|
|
52
|
-
exports.ADR_290_REJECTED_TIMESTAMP = process.env.ADR_290_REJECTED_TIMESTAMP
|
|
53
|
-
? parseInt(process.env.ADR_290_REJECTED_TIMESTAMP)
|
|
54
|
-
: exports.ADR_290_OPTIONAL_TIMESTAMP + THREE_MONTHS_IN_MS;
|
|
55
|
+
exports.ADR_290_OPTIONAL_TIMESTAMP = parseTimestamp(process.env.ADR_290_TIMESTAMP, 1762743600000);
|
|
56
|
+
exports.ADR_290_REJECTED_TIMESTAMP = parseTimestamp(process.env.ADR_290_REJECTED_TIMESTAMP, exports.ADR_290_OPTIONAL_TIMESTAMP + THREE_MONTHS_IN_MS);
|
|
55
57
|
/**
|
|
56
58
|
* DCL Launch Day
|
|
57
59
|
* @public
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timestamps.js","sourceRoot":"","sources":["../../src/validations/timestamps.ts"],"names":[],"mappings":";;;AAAA
|
|
1
|
+
{"version":3,"file":"timestamps.js","sourceRoot":"","sources":["../../src/validations/timestamps.ts"],"names":[],"mappings":";;;AAAA,SAAS,cAAc,CAAC,MAA0B,EAAE,YAAoB;IACtE,IAAI,CAAC,MAAM;QAAE,OAAO,YAAY,CAAA;IAChC,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAA;IAC/B,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAA;AAC9C,CAAC;AAED;;;GAGG;AACU,QAAA,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;AAE3F;;;GAGG;AACU,QAAA,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;AAE3F;;;GAGG;AACU,QAAA,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAA;AAE3F;;;GAGG;AACU,QAAA,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;AAE7F;;;GAGG;AACU,QAAA,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;AAE7F;;;GAGG;AACU,QAAA,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;AAE7F;;;GAGG;AACU,QAAA,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;AAE7F;;;GAGG;AACU,QAAA,iBAAiB,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;AAE7F,MAAM,kBAAkB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAA;AAEvD;;;GAGG;AACU,QAAA,0BAA0B,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;AAEzF,QAAA,0BAA0B,GAAG,cAAc,CACtD,OAAO,CAAC,GAAG,CAAC,0BAA0B,EACtC,kCAA0B,GAAG,kBAAkB,CAChD,CAAA;AAED;;;GAGG;AACU,QAAA,kCAAkC,GAAG,aAAa,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dcl/content-validator",
|
|
3
|
-
"version": "7.1.
|
|
3
|
+
"version": "7.1.1",
|
|
4
4
|
"description": "Catalyst content validations",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -53,5 +53,5 @@
|
|
|
53
53
|
"files": [
|
|
54
54
|
"dist"
|
|
55
55
|
],
|
|
56
|
-
"commit": "
|
|
56
|
+
"commit": "8f3a8e773b1178d58e2cdcf84773dfda2e9c52f6"
|
|
57
57
|
}
|