Fix: Fetch all blocks in a Slot (#1443)

* remove cursor from slot blocks request * fix: add cursor from response * fix: slot blocks query * fix: add copy button to commit id * fix: update block stats query --------- Co-authored-by: Mario <[email protected]> Co-authored-by: Begoña Álvarez de la Cruz <[email protected]>
iotaledger · Apr 26, 2024 · e4be147 · e4be147
1 parent 6aecb37
commit e4be147
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 26 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 = {

diff --git a/client/src/app/routes/nova/SlotPage.tsx b/client/src/app/routes/nova/SlotPage.tsx
@@ -91,7 +91,7 @@ export default function SlotPage({
                             <div className="section--data">
                                 <div className="label">Commitment Id</div>
                                 <div className="value code">
-                                    <TruncatedId id={slotCommitmentId ?? FALLBACK_STRING} />
+                                    <TruncatedId id={slotCommitmentId ?? FALLBACK_STRING} showCopyButton />
                                 </div>
                             </div>
                             <div className="card-info-wrapper">

diff --git a/client/src/app/routes/nova/TransactionPage.tsx b/client/src/app/routes/nova/TransactionPage.tsx
@@ -125,7 +125,7 @@ const TransactionPage: React.FC<RouteComponentProps<TransactionPageProps>> = ({
             <div className="section--data">
                 <div className="label">Slot Commitment</div>
                 <div className="value code">
-                    <TruncatedId id={block.header.slotCommitmentId} />
+                    <TruncatedId id={block.header.slotCommitmentId} showCopyButton />
                 </div>
             </div>
             {issuerAddress && (

diff --git a/client/src/models/api/nova/ISlotBlocksRequest.ts b/client/src/models/api/nova/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/client/src/services/nova/novaApiClient.ts b/client/src/services/nova/novaApiClient.ts
@@ -305,13 +305,7 @@ export class NovaApiClient extends ApiClient {
      * @returns The response from the request.
      */
     public async getSlotBlocks(request: ISlotBlocksRequest): Promise<ISlotBlocksResponse> {
-        const params = {
-            cursor: request.cursor,
-        };
-        return this.callApi<unknown, ISlotBlocksResponse>(
-            `nova/slot/blocks/chronicle/${request.network}/${request.slotIndex}${FetchHelper.urlParams(params)}`,
-            "get",
-        );
+        return this.callApi<unknown, ISlotBlocksResponse>(`nova/slot/blocks/chronicle/${request.network}/${request.slotIndex}`, "get");
     }
 
     /**