fix endpoint + make window 48 hours

Author: will pankiewicz

packages/common/src/constants.ts

@@ -12,6 +12,10 @@ export const WEEK = 7 * 24 * 60 * 60 * 1000;
 /// The time a node has to make an upgrade to the latest release.
 export const SIXTEEN_HOURS = 16 * 60 * 60 * 1000;
 
+export const TWENTY_FOUR_HOURS = 24 * 60 * 60 * 1000;
+
+export const FORTY_EIGHT_HOURS = 48 * 60 * 60 * 1000;
+
 export const GATEWAY_CACHE_TTL = 18 * 1000;
 
 /// Number of Eras in 4 days that a validator should have claimed all previous rewards except

packages/common/src/constraints/ValidityChecks.ts

@@ -116,12 +116,20 @@ export const checkLatestClientVersion = async (
       );
     }
 
+    // Ensure latestRelease contains a valid name
+    if (!latestRelease || !latestRelease.name) {
+      logger.error(
+        `Latest release name is null or undefined: ${latestRelease}`,
+        constraintsLabel,
+      );
+      return false;
+    }
+
     // Check if there is a latest release and if the current time is past the grace window
     const isPastGraceWindow =
-      latestRelease &&
-      Date.now() > latestRelease.publishedAt + Constants.SIXTEEN_HOURS;
+      Date.now() > latestRelease.publishedAt + Constants.FORTY_EIGHT_HOURS;
 
-    if (latestRelease && isPastGraceWindow) {
+    if (isPastGraceWindow) {
       const nodeVersion = semver.coerce(candidate.version);
       const latestVersion = forceLatestRelease
         ? semver.clean(forceLatestRelease)
@@ -140,7 +148,7 @@ export const checkLatestClientVersion = async (
 
       const isUpgraded = semver.gte(nodeVersion, latestVersion);
 
-      // If they are not upgrade, set the validity as invalid
+      // If they are not upgraded, set the validity as invalid
       if (!isUpgraded) {
         await setLatestClientReleaseValidity(candidate.stash, false);
         return false;
@@ -150,7 +158,7 @@ export const checkLatestClientVersion = async (
       await setLatestClientReleaseValidity(candidate.stash, true);
       return true;
     } else {
-      // If there is no latest release or if not past the grace window, set the release as invalid
+      // If not past the grace window, set the release as invalid
       await setLatestClientReleaseValidity(candidate.stash, false);
       return false;
     }
@@ -182,7 +190,6 @@ export const checkConnectionTime = async (
       await setConnectionTimeInvalidity(candidate.stash, true);
       return true;
     }
-    return true;
   } catch (e) {
     logger.error(`Error checking connection time: ${e}`, constraintsLabel);
     return false;
@@ -254,7 +261,6 @@ export const checkCommission = async (
       await setCommissionInvalidity(candidate.stash, true);
       return true;
     }
-    return true;
   } catch (e) {
     logger.error(`Error checking commission: ${e}`, constraintsLabel);
     return false;
@@ -317,7 +323,6 @@ export const checkUnclaimed = async (
       await setUnclaimedInvalidity(candidate.stash, true);
       return true;
     }
-    return true;
   } catch (e) {
     logger.error(`Error checking unclaimed: ${e}`, constraintsLabel);
     return false;
@@ -339,7 +344,6 @@ export const checkBlocked = async (
       await setBlockedInvalidity(candidate.stash, true);
       return true;
     }
-    return true;
   } catch (e) {
     logger.error(`Error checking blocked: ${e}`, constraintsLabel);
     return false;
@@ -376,7 +380,6 @@ export const checkProvider = async (
       await setProviderInvalidity(candidate.stash, true);
       return true;
     }
-    return true;
   } catch (e) {
     logger.error(`Error checking provider: ${e}`, constraintsLabel);
     return false;

packages/common/src/db/queries/Release.ts

@@ -17,5 +17,14 @@ export const setRelease = async (
 };
 
 export const getLatestRelease = async (): Promise<any> => {
-  return (await ReleaseModel.find({}).lean().sort("-publishedAt").limit(1))[0];
+  try {
+    const latestRelease = await ReleaseModel.findOne({})
+      .sort("-publishedAt")
+      .lean()
+      .limit(1);
+    return latestRelease;
+  } catch (error) {
+    console.error("Error while fetching latest release:", error);
+    throw error;
+  }
 };

packages/common/src/monitor.ts

@@ -39,8 +39,13 @@ export default class Monitor {
     const { tag_name, published_at } = latestRelease.data;
     const publishedAt = new Date(published_at).getTime();
 
-    const tagParts = tag_name.split("-");
-    const version = tagParts[tagParts.length - 1];
+    // Extract version number from the tag name
+    const versionMatch = tag_name.match(/v?(\d+\.\d+\.\d+)/);
+    if (!versionMatch) {
+      logger.warn(`Unable to extract version from tag name: ${tag_name}`);
+      return null;
+    }
+    const version = versionMatch[1]; // Extracted version number
 
     await queries.setRelease(version, publishedAt);
 

packages/common/src/scorekeeper/jobs/specificJobs/ReleaseMonitorJob.ts

@@ -22,7 +22,6 @@ export const getLatestTaggedRelease = async () => {
     const ghApi = new Octokit();
 
     try {
-      // Assign the result of ghApi.repos.getLatestRelease() to latestRelease
       const release = await ghApi.repos.getLatestRelease({
         owner: "paritytech",
         repo: "polkadot-sdk",
@@ -32,7 +31,6 @@ export const getLatestTaggedRelease = async () => {
       logger.warn("Could not get latest release.", monitorLabel);
     }
 
-    // Check if latestRelease is null or if tag_name and published_at are not present
     if (
       !latestRelease ||
       !latestRelease.tag_name ||
@@ -44,20 +42,22 @@ export const getLatestTaggedRelease = async () => {
     const { tag_name, published_at } = latestRelease;
     const publishedAt = new Date(published_at).getTime();
 
-    await queries.setRelease(tag_name, publishedAt);
+    const version = tag_name.split("-")[1];
 
-    const taggedReleaseName = latestRelease ? latestRelease?.name : "";
-    if (latestRelease && tag_name === taggedReleaseName) {
+    await queries.setRelease(version, publishedAt);
+
+    const taggedReleaseName = latestRelease ? latestRelease.name : "";
+    if (latestRelease && version === taggedReleaseName) {
       logger.info("No new release found", monitorLabel);
     } else {
       latestRelease = {
-        name: tag_name.split(`-`)[0],
+        name: version,
         publishedAt,
       };
     }
 
     logger.info(
-      `Latest release updated: ${taggedReleaseName} | Published at: ${publishedAt}`,
+      `Latest release updated: ${version} | Published at: ${publishedAt}`,
       monitorLabel,
     );
 
@@ -76,6 +76,7 @@ export const getLatestTaggedRelease = async () => {
     jobStatusEmitter.emit("jobErrored", errorStatus);
   }
 };
+
 // Called by worker to process Job
 export const processReleaseMonitorJob = async (job: any) => {
   await getLatestTaggedRelease();

packages/gateway/src/routes/index.ts

@@ -9,6 +9,8 @@ import Location from "../controllers/Location";
 import Validator from "../controllers/Validators";
 import Rewards from "../controllers/Rewards";
 import Block from "../controllers/Block";
+import { response } from "../controllers";
+import { queries } from "@1kv/common";
 
 const router: any = new Router();
 
@@ -127,4 +129,8 @@ router.get(API.BlockIndex, Block.getBlockIndex);
 router.get(API.StatsTotalReqeusts, Stats.getTotalRequests);
 router.get(API.StatsEndpointCounts, Stats.getEndpointCounts);
 
+router.get(API.Release, async (ctx: any) => {
+  response(ctx, 200, await queries.getLatestRelease());
+});
+
 export default router;