PR cleanup

akash-network · Sep 12, 2023 · 437262b · 437262b
1 parent 2a78145
commit 437262b
Show file tree

Hide file tree

Showing 9 changed files with 225 additions and 234 deletions.
diff --git a/api/src/db/networkRevenueProvider.ts b/api/src/db/networkRevenueProvider.ts
@@ -12,7 +12,7 @@ export const getWeb3IndexRevenue = async (debug?: boolean) => {
     date: r.date.getTime() / 1000,
     revenue: round(r.usd, 2),
     revenueUAkt: r.uakt,
-    revenueUUsdc: r.uusdc,// TODO: Include in web3index? Maybe should only include akt spending
+    revenueUUsdc: r.uusdc,
     aktPrice: r.aktPrice,
     dateStr: r.date
   }));
@@ -61,34 +61,41 @@ export const getWeb3IndexRevenue = async (debug?: boolean) => {
     if (date <= sixtyDaysAgo) {
       sixtyDaysAgoRevenue += b.revenue;
       sixtyDaysAgoRevenueUAkt += b.revenueUAkt;
+      sixtyDaysAgoRevenueUUsdc += b.revenueUUsdc;
     }
     if (date <= thirtyDaysAgo) {
       thirtyDaysAgoRevenue += b.revenue;
       thirtyDaysAgoRevenueUAkt += b.revenueUAkt;
+      thirtyDaysAgoRevenueUUsdc += b.revenueUUsdc;
     }
     if (date <= twoWeeksAgo) {
       twoWeeksAgoRevenue += b.revenue;
       twoWeeksAgoRevenueUAkt += b.revenueUAkt;
+      twoWeeksAgoRevenueUUsdc += b.revenueUUsdc;
     }
     if (date <= oneWeekAgo) {
       oneWeekAgoRevenue += b.revenue;
       oneWeekAgoRevenueUAkt += b.revenueUAkt;
+      oneWeekAgoRevenueUUsdc += b.revenueUUsdc;
     }
     if (date <= twoDaysAgo) {
       twoDaysAgoRevenue += b.revenue;
       twoDaysAgoRevenueUAkt += b.revenueUAkt;
+      twoDaysAgoRevenueUUsdc += b.revenueUUsdc;
     }
     if (date <= oneDayAgo) {
       oneDayAgoRevenue += b.revenue;
       oneDayAgoRevenueUAkt += b.revenueUAkt;
+      oneDayAgoRevenueUUsdc += b.revenueUUsdc;
     }
 
     totalRevenue += b.revenue;
     totalRevenueUAkt += b.revenueUAkt;
+    totalRevenueUUsdc += b.revenueUUsdc;
   }, 0);
 
   if (!debug) {
-    days = days.map(({ dateStr, revenueUAkt, aktPrice, ...others }) => others) as any;
+    days = days.map(({ dateStr, revenueUAkt, revenueUUsdc, aktPrice, ...others }) => others) as any;
   }
 
   let revenueStats = {
@@ -112,7 +119,15 @@ export const getWeb3IndexRevenue = async (debug?: boolean) => {
       twoWeeksAgAkt: uaktToAKT(twoWeeksAgoRevenueUAkt, 6),
       thirtyDaysAgoAkt: uaktToAKT(thirtyDaysAgoRevenueUAkt, 6),
       sixtyDaysAgoAkt: uaktToAKT(sixtyDaysAgoRevenueUAkt, 6),
-      ninetyDaysAgoAkt: uaktToAKT(ninetyDaysAgoRevenueUAkt, 6)
+      ninetyDaysAgoAkt: uaktToAKT(ninetyDaysAgoRevenueUAkt, 6),
+      nowUsdc: udenomToDenom(totalRevenueUUsdc, 6),
+      oneDayAgoUsdc: udenomToDenom(oneDayAgoRevenueUUsdc, 6),
+      twoDaysAgoUsdc: udenomToDenom(twoDaysAgoRevenueUUsdc, 6),
+      oneWeekAgoUsdc: udenomToDenom(oneWeekAgoRevenueUUsdc, 6),
+      twoWeeksAgUsdc: udenomToDenom(twoWeeksAgoRevenueUUsdc, 6),
+      thirtyDaysAgoUsdc: udenomToDenom(thirtyDaysAgoRevenueUUsdc, 6),
+      sixtyDaysAgoUsdc: udenomToDenom(sixtyDaysAgoRevenueUUsdc, 6),
+      ninetyDaysAgoUsdc: udenomToDenom(ninetyDaysAgoRevenueUUsdc, 6)
     } as any;
   }
 
@@ -163,9 +178,8 @@ export async function getDailyRevenue() {
     date: x.date,
     uakt: x.uakt,
     akt: uaktToAKT(x.uakt, 6),
-    aktInUsd: uaktToAKT(x.uakt, 6) * x.aktPrice,
     uusdc: x.uusdc,
-    usdc: udenomToDenom(x.uusdc),
+    usdc: udenomToDenom(x.uusdc, 6),
     usd: uaktToAKT(x.uakt, 6) * x.aktPrice + udenomToDenom(x.uusdc),
     aktPrice: x.aktPrice
   }));

diff --git a/deploy-web/src/pages/graph/[snapshot].tsx b/deploy-web/src/pages/graph/[snapshot].tsx
@@ -185,6 +185,8 @@ const getSnapshotMetadata = (snapshot: Snapshots): { unitFn: (number) => ISnapsh
     case Snapshots.totalUAktSpent:
     case Snapshots.dailyUUsdcSpent:
     case Snapshots.totalUUsdcSpent:
+    case Snapshots.dailyUUsdSpent:
+    case Snapshots.totalUUsdSpent:
       return { unitFn: x => ({ value: udenomToDenom(x) }) };
     case Snapshots.activeCPU:
       return {
@@ -223,6 +225,8 @@ const getTitle = (snapshot: Snapshots): string => {
       return "Total AKT spent";
     case Snapshots.totalUUsdcSpent:
       return "Total USDC spent";
+    case Snapshots.totalUUsdSpent:
+      return "Total USD spent";
     case Snapshots.totalLeaseCount:
       return "All-time lease count";
     case Snapshots.activeCPU:
@@ -237,6 +241,8 @@ const getTitle = (snapshot: Snapshots): string => {
       return "Daily AKT spent";
     case Snapshots.dailyUUsdcSpent:
       return "Daily USDC spent";
+    case Snapshots.dailyUUsdSpent:
+      return "Daily USD spent";
     case Snapshots.dailyLeaseCount:
       return "Daily new leases";
 

diff --git a/deploy-web/src/types/snapshots.ts b/deploy-web/src/types/snapshots.ts
@@ -2,7 +2,7 @@ export enum Snapshots {
   activeLeaseCount = "activeLeaseCount",
   totalUAktSpent = "totalUAktSpent",
   totalUUsdcSpent = "totalUUsdcSpent",
-  totalUsdSpent = "totalUUsdSpent",
+  totalUUsdSpent = "totalUUsdSpent",
   totalLeaseCount = "totalLeaseCount",
   activeCPU = "activeCPU",
   activeGPU = "activeGPU",

diff --git a/deploy-web/src/utils/snapshotsUrlHelpers.ts b/deploy-web/src/utils/snapshotsUrlHelpers.ts
@@ -12,8 +12,10 @@ export const urlParamToSnapshot = (snapshotsUrlParam: SnapshotsUrlParam) => {
     [SnapshotsUrlParam.storage]: Snapshots.activeStorage,
     [SnapshotsUrlParam.totalAKTSpent]: Snapshots.totalUAktSpent,
     [SnapshotsUrlParam.totalUSDCSpent]: Snapshots.totalUUsdcSpent,
+    [SnapshotsUrlParam.totalUSDSpent]: Snapshots.totalUUsdSpent,
     [SnapshotsUrlParam.dailyAktSpent]: Snapshots.dailyUAktSpent,
     [SnapshotsUrlParam.dailyUsdcSpent]: Snapshots.dailyUUsdcSpent,
+    [SnapshotsUrlParam.dailyUsdSpent]: Snapshots.dailyUUsdSpent,
     [SnapshotsUrlParam.dailyDeploymentCount]: Snapshots.dailyLeaseCount
   };