@glowlabs-org/utils 0.1.2 → 0.1.4

package/dist/esm/lib/create-weekly-report/index.d.ts

@@ -14,7 +14,7 @@ export type CreateWeeklyReportArgs = {
     gcaUrls: string[];
     apiUrl: string;
 };
-export declare function createWeeklyReport({ week, gcaUrls, apiUrl, }: CreateWeeklyReportArgs): Promise<{
+export declare function createWeeklyReportLegacy(args: CreateWeeklyReportArgs): Promise<{
     headlineStats: {
         weekNumber: number;
         totalCreditsProduced: string;
@@ -36,7 +36,8 @@ export declare function createWeeklyReport({ week, gcaUrls, apiUrl, }: CreateWee
     }[];
     farms: import("./types").Farm[];
     rawData: import("./types").GCAServerResponse;
-} | {
+}>;
+export declare function createWeeklyReport({ week, gcaUrls, apiUrl, }: CreateWeeklyReportArgs): Promise<{
     headlineStats: {
         weekNumber: number;
         totalCreditsProduced: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@glowlabs-org/utils",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "A library containing all typechain types and addresses relating to the glow guarded launch",
   "keywords": [],
   "author": "",

package/src/index.ts

@@ -1,3 +1,6 @@
 export * from "./lib/create-weekly-report/types/index";
 export * from "./constants/index";
-export { createWeeklyReport } from "./lib/create-weekly-report/index";
+export {
+  createWeeklyReport,
+  createWeeklyReportLegacy,
+} from "./lib/create-weekly-report/index";

package/src/lib/create-weekly-report/index.ts

@@ -39,7 +39,7 @@ export type CreateWeeklyReportArgs = {
   apiUrl: string;
 };
 
-async function createWeeklyReportLegacy(args: CreateWeeklyReportArgs) {
+export async function createWeeklyReportLegacy(args: CreateWeeklyReportArgs) {
   const mapLegacy = new Map<string, MerkleLeafIntermediary>();
 
   function addValueToMapLegacy(
@@ -372,10 +372,6 @@ export async function createWeeklyReport({
   gcaUrls,
   apiUrl,
 }: CreateWeeklyReportArgs) {
-  if (week < 72) {
-    return createWeeklyReportLegacy({ week, gcaUrls, apiUrl });
-  }
-
   const map = new Map<string, MerkleLeaf>();
 
   const [apiResponse, auditsRes] = await Promise.all([
@@ -414,16 +410,6 @@ export async function createWeeklyReport({
       shortIdToAdjustedCredit.set(String(sid), splitBigInt);
   }
 
-  const farmShortIds = new Set(farms.map((f: any) => String(f.shortId)));
-  audits.forEach((audit: any) =>
-    audit.activeShortIds?.forEach((sid: string | number) => {
-      if (!farmShortIds.has(String(sid)))
-        throw new Error(
-          `activeShortId ${sid} from audit ${audit.id} missing in filteredFarms`
-        );
-    })
-  );
-
   let totalCreditsProduced18dp = BigInt(0);
 
   for (const farm of farms) {
@@ -470,6 +456,11 @@ export async function createWeeklyReport({
     const adjustedCreditBigInt =
       shortIdToAdjustedCredit.get(String(farm.shortId)) ?? BigInt(0);
 
+    if (adjustedCreditBigInt <= BigInt(0))
+      throw new Error(
+        `Adjusted credit is less than or equal to 0 for farm ${farm.shortId}`
+      );
+
     for (const split of farm.rewardSplits) {
       const glowWeight = multiplyBigIntByDecimalPercentage(
         glowBase,