Merge branch 'dev' into feat/issues-1349-review-info-boxes

iotaledger · Apr 26, 2024 · 7db85f2 · 7db85f2
2 parents e811436 + e4be147
commit 7db85f2
Show file tree

Hide file tree

Showing 23 changed files with 289 additions and 220 deletions.
diff --git a/api/src/models/api/nova/chronicle/ISlotBlocksRequest.ts b/api/src/models/api/nova/chronicle/ISlotBlocksRequest.ts
@@ -8,9 +8,4 @@ export interface ISlotBlocksRequest {
      * The slot index to get the details for.
      */
     slotIndex: string;
-
-    /**
-     * The cursor state for the request.
-     */
-    cursor?: string;
 }
diff --git a/api/src/services/nova/chronicleService.ts b/api/src/services/nova/chronicleService.ts
@@ -58,9 +58,7 @@ export class ChronicleService {
 
         do {
             try {
-                const params = {
-                    cursor: request.cursor,
-                };
+                const params = { cursor };
                 const response = await FetchHelper.json<never, ISlotBlocksResponse>(
                     this.chronicleEndpoint,
                     `${CHRONICLE_ENDPOINTS.slotBlocks}${params ? `${FetchHelper.urlParams(params)}` : ""}`.replace(
@@ -69,9 +67,7 @@ export class ChronicleService {
                     ),
                     "get",
                 );
-                // Hardcoded to null for now because chronicle always returns the same cursor: https://github.com/iotaledger/inx-chronicle/issues/1362
-                cursor = null;
-                // cursor = response.cursor;
+                cursor = response.cursor;
 
                 if (response.blocks) {
                     slotBlocks.push(...response.blocks);

diff --git a/api/src/services/nova/influx/influxQueries.ts b/api/src/services/nova/influx/influxQueries.ts
@@ -93,7 +93,7 @@ export const BLOCK_STATS_QUERY = `
         sum("candidacy_announcement_count") AS "candidacy",
         sum("validation_count") AS "noPayload"
     FROM "iota_block_activity"
-    WHERE time >= $from and time <= $to
+    WHERE time >= $from and time < $to
 `;
 
 export const TOKENS_HELD_BY_OUTPUTS_DAILY_QUERY = {