@dcl/content-validator 2.0.1-20220609191823.commit-1513a18 → 2.0.1-20220610154219.commit-81cc697

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":"the-graph-client.d.ts","sourceRoot":"","sources":["../../src/the-graph-client/the-graph-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,cAAc,EAAQ,MAAM,UAAU,CAAA;AAG3E;;GAEG;AACH,eAAO,MAAM,oBAAoB,eACnB,KAAK,0BAA0B,EAAE,MAAM,GAAG,eAAe,CAAC,KACrE,cAqRF,CAAA"}
1
+ {"version":3,"file":"the-graph-client.d.ts","sourceRoot":"","sources":["../../src/the-graph-client/the-graph-client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,EAAE,cAAc,EAAQ,MAAM,UAAU,CAAA;AAG3E;;GAEG;AACH,eAAO,MAAM,oBAAoB,eACnB,KAAK,0BAA0B,EAAE,MAAM,GAAG,eAAe,CAAC,KACrE,cAgPF,CAAA"}
@@ -1,10 +1,6 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
3
  exports.createTheGraphClient = void 0;
7
- const ms_1 = __importDefault(require("ms"));
8
4
  /**
9
5
  * @public
10
6
  */
@@ -105,34 +101,22 @@ const createTheGraphClient = (components) => {
105
101
  return query.mapper(response);
106
102
  }
107
103
  catch (error) {
104
+ console.log(error);
108
105
  logger.error(`Failed to execute the following query to the subgraph ${urls[query.subgraph]} ${query.description}'.`, {
109
106
  query: query.query,
110
- variables: JSON.stringify(variables),
111
- error
107
+ variables: JSON.stringify(variables)
112
108
  });
113
109
  throw new Error('Internal server error');
114
110
  }
115
111
  };
116
- // When we want to find a block for a specific timestamp, we define an access window. This means that
117
- // we will place will try to find the closes block to the timestamp, but only if it's within the window
118
- const ACCESS_WINDOW_IN_SECONDS = (0, ms_1.default)('15s') / 1000;
119
- const getWindowFromTimestamp = (timestamp) => {
120
- const windowMin = timestamp - Math.floor(ACCESS_WINDOW_IN_SECONDS / 2);
121
- const windowMax = timestamp + Math.ceil(ACCESS_WINDOW_IN_SECONDS / 2);
122
- return {
123
- max: windowMax,
124
- min: windowMin
125
- };
126
- };
127
112
  const findBlocksForTimestamp = async (subgraph, timestamp) => {
128
113
  const query = {
129
114
  description: 'fetch blocks for timestamp',
130
115
  subgraph: subgraph,
131
116
  query: QUERY_BLOCKS_FOR_TIMESTAMP,
132
117
  mapper: (response) => {
133
- // To get the deployment's block number, we check the one immediately after the entity's timestamp. Since it could not exist, we default to the one immediately before.
134
- const blockNumberAtDeployment = response.after[0]?.number ?? response.before[0]?.number;
135
- const blockNumberFiveMinBeforeDeployment = response.fiveMinAfter[0]?.number ?? response.fiveMinBefore[0]?.number;
118
+ const blockNumberAtDeployment = response.max[0].number;
119
+ const blockNumberFiveMinBeforeDeployment = response.min[0].number;
136
120
  if (blockNumberAtDeployment === undefined &&
137
121
  blockNumberFiveMinBeforeDeployment === undefined) {
138
122
  throw new Error(`Failed to find blocks for the specific timestamp`);
@@ -149,25 +133,10 @@ const createTheGraphClient = (components) => {
149
133
  };
150
134
  const timestampSec = Math.ceil(timestamp / 1000);
151
135
  const timestamp5MinAgo = timestampSec - 60 * 5;
152
- const window = getWindowFromTimestamp(timestampSec);
153
- const window5MinAgo = getWindowFromTimestamp(timestamp5MinAgo);
154
- try {
155
- return await runQuery(query, {
156
- timestamp: timestampSec,
157
- timestampMax: window.max,
158
- timestampMin: window.min,
159
- timestamp5Min: timestamp5MinAgo,
160
- timestamp5MinMax: window5MinAgo.max,
161
- timestamp5MinMin: window5MinAgo.min
162
- });
163
- }
164
- catch (e) {
165
- logger.error(`Error fetching the block number for timestamp`, {
166
- timestamp,
167
- error: e?.message
168
- });
169
- throw e;
170
- }
136
+ return await runQuery(query, {
137
+ timestamp: timestampSec,
138
+ timestamp5Min: timestamp5MinAgo
139
+ });
171
140
  };
172
141
  return {
173
142
  checkForNamesOwnershipWithTimestamp,
@@ -177,33 +146,17 @@ const createTheGraphClient = (components) => {
177
146
  };
178
147
  exports.createTheGraphClient = createTheGraphClient;
179
148
  const QUERY_BLOCKS_FOR_TIMESTAMP = `
180
- query getBlockForTimestamp($timestamp: Int!, $timestampMin: Int!, $timestampMax: Int!, $timestamp5Min: Int!, $timestamp5MinMax: Int!, $timestamp5MinMin: Int!) {
181
- before: blocks(
182
- where: {timestamp_lte: $timestamp, timestamp_gte: $timestampMin}
183
- first: 1
184
- orderBy: timestamp
185
- orderDirection: desc
186
- ) {
187
- number
188
- }
189
- after: blocks(
190
- where: {timestamp_gte: $timestamp, timestamp_lte: $timestampMax}
191
- first: 1
192
- orderBy: timestamp
193
- orderDirection: asc
194
- ) {
195
- number
196
- }
197
- fiveMinBefore: blocks(
198
- where: {timestamp_lte: $timestamp5Min, timestamp_gte: $timestamp5MinMin}
149
+ query getBlockForTimestampRange($timestamp: Int!, $timestamp5Min: Int!) {
150
+ min: blocks(
151
+ where: {timestamp_gte: $timestamp5Min, timestamp_lte: $timestamp}
199
152
  first: 1
200
153
  orderBy: timestamp
201
154
  orderDirection: desc
202
155
  ) {
203
156
  number
204
157
  }
205
- fiveMinAfter: blocks(
206
- where: {timestamp_gte: $timestamp5Min, timestamp_lte: $timestamp5MinMax}
158
+ max: blocks(
159
+ where: {timestamp_gte: $timestamp5Min, timestamp_lte: $timestamp}
207
160
  first: 1
208
161
  orderBy: timestamp
209
162
  orderDirection: asc
@@ -1 +1 @@
1
- {"version":3,"file":"the-graph-client.js","sourceRoot":"","sources":["../../src/the-graph-client/the-graph-client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"the-graph-client.js","sourceRoot":"","sources":["../../src/the-graph-client/the-graph-client.ts"],"names":[],"mappings":"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"}
@@ -29,7 +29,7 @@ exports.profiles = {
29
29
  }
30
30
  if (deployment.entity.timestamp < index_1.ADR_XXX_TIMESTAMP)
31
31
  return types_1.OK;
32
- const names = allNames(deployment.entity);
32
+ const names = allClaimedNames(deployment.entity);
33
33
  if (names.length > 0) {
34
34
  const ownedNames = await theGraphClient.checkForNamesOwnershipWithTimestamp(ethAddress, names, deployment.entity.timestamp);
35
35
  const notOwnedNames = names.filter((name) => !ownedNames.has(name));
@@ -46,7 +46,7 @@ exports.profiles = {
46
46
  return types_1.OK;
47
47
  }
48
48
  };
49
- const allNames = (entity) => entity.metadata.avatars
49
+ const allClaimedNames = (entity) => entity.metadata.avatars
50
50
  .filter((avatar) => avatar.hasClaimedName)
51
51
  .map((avatar) => avatar.name)
52
52
  .filter((name) => name && name.trim().length > 0);
@@ -1 +1 @@
1
- {"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../src/validations/access-checker/profiles.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"profiles.js","sourceRoot":"","sources":["../../../src/validations/access-checker/profiles.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dcl/content-validator",
3
- "version": "2.0.1-20220609191823.commit-1513a18",
3
+ "version": "2.0.1-20220610154219.commit-81cc697",
4
4
  "description": "Catalyst content validations",
5
5
  "main": "dist/index.js",
6
6
  "typings": "dist/index.d.ts",
@@ -59,5 +59,5 @@
59
59
  "files": [
60
60
  "dist"
61
61
  ],
62
- "commit": "1513a18d71be1191f0e65fc555537e1880588256"
62
+ "commit": "81cc697d3dc4370196f6a912ff38dc12e34e0444"
63
63
  }