Merge branch 'main' of https://github.com/CoNET-project/CONET-Gateway

Author: CoNETProject

src/localServer/define.d.ts

@@ -259,7 +259,6 @@ declare type WorkerCommand =
   | "addMonitoredWallet"
   | "removeMonitoredWallet"
   | "getProfileAvailableCntpReward"
-  | "claimChristmasReward" ;
 
 type SINodesSortby = 'CUSTOMER_REVIEW'|'TOTAL_ONLINE_TIME'|
 	'STORAGE_PRICE_LOW'|'STORAGE_PRICE_HIGH'|'OUTBOUND_PRICE_HIGH'|'OUTBOUND_PRICE_LOW'
@@ -362,6 +361,11 @@ interface conet_ticket {
   balance: string;
 }
 
+interface historicBalance {
+	timestamp: number
+	balance: string
+}
+
 interface profile extends keyPair {
   isPrimary?: boolean;
   pgpKey?: pgpKeyPair;
@@ -378,6 +382,7 @@ interface profile extends keyPair {
   nodeID?: number;
   nodeIP_address?: string;
   nodeRegion?: string;
+	historicBalance?: historicBalance[]
 }
 
 interface publicProfile {

src/localServer/workers/encrypt.ts

@@ -829,14 +829,6 @@ const processCmd = async (cmd: worker_command) => {
         return removeMonitoredWallet(cmd);
       }
 
-      case "getProfileAvailableCntpReward": {
-        return getProfileAvailableCntpReward(cmd);
-      }
-
-      case "claimChristmasReward": {
-        return claimChristmasReward(cmd);
-      }
-
       default: {
         cmd.err = "INVALID_COMMAND";
         responseChannel.postMessage(JSON.stringify(cmd));

src/localServer/workers/utilities/utilV2.ts

@@ -592,3 +592,35 @@ const getRegionAllNodes = async (region: string, profile: profile) => {
 	//		curl -v -4 -x socks4://localhost:3003 "https://www.google.com"
 }
 
+function generateDaysArrayForBalanceChart(): number[] {
+  const currentDate = new Date(); // Current date (in local time)
+
+  // Get current day, month, and year in UTC
+  const currentDay = currentDate.getUTCDate(); // Current day of the month (UTC)
+  const currentMonth = currentDate.getUTCMonth() + 1; // Current month (1-indexed) (UTC)
+  const currentYear = currentDate.getUTCFullYear(); // Current year (UTC)
+
+  // Calculate the start date (30 days before today) using UTC
+  const startDate = new Date(
+    Date.UTC(currentYear, currentMonth - 1, currentDay - 30)
+  );
+
+  const daysArray: number[] = [];
+  let tempDate = new Date(startDate);
+
+  // Generate days with 7-day intervals using UTC
+  while (tempDate < currentDate) {
+    // Set the time to 00:00:00 UTC (midnight) on the selected day
+    tempDate.setUTCHours(0, 0, 0, 0); // Set to 00:00 UTC
+    daysArray.push(tempDate.getTime()); // Push the timestamp (UTC)
+
+    // Add 7 days in UTC
+    tempDate.setUTCDate(tempDate.getUTCDate() + 7);
+  }
+
+  // Add today's timestamp in UTC (at 00:00 UTC)
+  currentDate.setUTCHours(0, 0, 0, 0); // Set to 00:00 UTC
+  daysArray.push(currentDate.getTime()); // Push today's timestamp (UTC)
+
+  return daysArray;
+}

src/localServer/workers/utilities/web3Util.ts

@@ -976,7 +976,6 @@ let provideCONET
 let lesteningBlock = false
 let epoch = 0
 let needUpgradeVer = 0
-let claimedCntpInChristmas2024Event = 0
 
 const listenProfileVer = async () => {
     epoch = await provideCONET.getBlockNumber()
@@ -999,13 +998,13 @@ const listenProfileVer = async () => {
 
             runningList.push(getBalanceOfMonitoredWallets())
 
-            runningList.push(getClaimedCntpReward())
+            runningList.push(getHistoricBalance())
 
             await Promise.all(runningList)
 
             const cmd = {
                 cmd: 'assets',
-                data: [profiles, RefereesList, leaderboardData, assetOracle, CoNET_Data?.monitoredWallets, claimedCntpInChristmas2024Event ]
+                data: [profiles, RefereesList, leaderboardData, assetOracle, CoNET_Data?.monitoredWallets ]
             }
 
             sendState('toFrontEnd', cmd)
@@ -1019,90 +1018,72 @@ const listenProfileVer = async () => {
     selectLeaderboard(epoch)
 }
 
-function isSpecificTime() {
-  const targetDate = new Date("2024-12-20T00:00:00-08:00"); // PST is UTC-8
-  const currentDate = new Date();
+const getHistoricBalance = async () => {
+    if (!CoNET_Data?.profiles) {
+        return logger(`getHistoricBalance Error! CoNET_Data.profiles empty Error!`)
+    }
 
-  const targetDatePST = new Date(
-    targetDate.toLocaleString("en-US", { timeZone: "America/Los_Angeles" })
-  );
+    const profiles = CoNET_Data.profiles
+    const daysInChart = generateDaysArrayForBalanceChart();
 
-  // Convert current date to PST
-  const currentDatePST = new Date(
-    currentDate.toLocaleString("en-US", { timeZone: "America/Los_Angeles" })
-  );
+    const runningList: any[] = []
 
-  return targetDatePST.getTime() <= currentDatePST.getTime();
+    for (let profile of profiles) {
+        const promise = getHistoricCntpBalance(profile, daysInChart)
+        runningList.push(promise)
+    }
+
+    await Promise.all(runningList)
 }
 
+const getHistoricCntpBalance = async (profile: profile, daysInChart: number[]) => {
+    const provideCONET = new ethers.JsonRpcProvider(conet_rpc);
+    const wallet = new ethers.Wallet(profile.privateKeyArmor, provideCONET)
+    const contract = new ethers.Contract(cCNTP_new_Addr, blast_CNTPAbi, wallet)
 
-const getClaimedCntpReward = async () => {
-    const provider = new ethers.JsonRpcProvider(conet_rpc);
-    
-    const christmas2024Contract = new ethers.Contract(
-        christmas2024ContractAddress,
-        christmas2024Abi,
-        provider
-    );
+    const runningList: any[] = []
 
-    try {
-        const claimedCntp = await christmas2024Contract.claimedCNTP()
-        claimedCntpInChristmas2024Event = Number(claimedCntp) / Math.pow(10, 18)
-    } catch (error) {
-        claimedCntpInChristmas2024Event = 0         
-    }
-}
+    for (let timestamp of daysInChart ) {
+      const promise =  getBalanceByTimestamp(
+        contract,
+        wallet.address,
+        timestamp
+      );
 
-const getProfileAvailableCntpReward = async (cmd) => {
-    if (!isSpecificTime()) return;
+      runningList.push(promise);
+    }
 
-    const walletAddress = cmd.data[0];
+    profile.historicBalance = [];
 
-    if (!CoNET_Data || !walletAddress) {
-        cmd.err = "FAILURE";
-        return returnUUIDChannel(cmd);
-    }
+    const balances = await Promise.all(runningList);
 
-    const provider = new ethers.JsonRpcProvider(conet_rpc);
-    
-    const christmas2024Contract = new ethers.Contract(
-        christmas2024ContractAddress,
-        christmas2024Abi,
-        provider
-    );
+    balances.forEach((balance, index) => {
+        const balanceObj = {
+            timestamp: daysInChart[index],
+            balance: ethers.formatEther(balance),
+        };
 
-    try {
-      const claimableCntp = await christmas2024Contract.showClaimableCNTP(walletAddress)
-      cmd.data = [Number(claimableCntp)];
-    } catch (err) {
-      logger(`error getting available CNTP reward`, err);
-      cmd.err = "FAILURE";
-    }
+        if(!profile.historicBalance) 
+            profile.historicBalance = [];
 
-    return returnUUIDChannel(cmd);
+        profile.historicBalance.push(balanceObj);
+    });
 }
 
-const claimChristmasReward = async (cmd: any) => {
-  if (!isSpecificTime()) return;
+function isSpecificTime() {
+  const targetDate = new Date("2024-12-20T00:00:00-08:00"); // PST is UTC-8
+  const currentDate = new Date();
 
-  const walletAddressTmp = cmd.data[0];
-  const walletAddress = ethers.getAddress(walletAddressTmp);
+  const targetDatePST = new Date(
+    targetDate.toLocaleString("en-US", { timeZone: "America/Los_Angeles" })
+  );
 
-  try {
-    const url = `${apiv4_endpoint}christmas2024`;
-    const result: any = await postToEndpoint(url, true, { walletAddress });
-    
-    if(!result){
-        cmd.err = "FAILURE"
-    }
-    else if (result.status === 200) {
-        cmd.data[0] = result;
-    }
-  } catch (err) {
-    cmd.err = "FAILURE"
-  }
+  // Convert current date to PST
+  const currentDatePST = new Date(
+    currentDate.toLocaleString("en-US", { timeZone: "America/Los_Angeles" })
+  );
 
-  return returnUUIDChannel(cmd);
+  return targetDatePST.getTime() <= currentDatePST.getTime();
 }
 
 const checkProfileVersion = async (wallet) => {
@@ -2398,6 +2379,7 @@ const getBalanceByTimestamp = async (erc20Contract, walletAddress: string, times
         return balance
     } catch (ex) {
         console.log("historic balance error", ex);
+        return 0
     }
 }
 
@@ -2421,11 +2403,11 @@ const getBlockByTimestamp = async (
   let earliestBlock = await provider.getBlock(0);
 
   // Ensure the target timestamp is valid
-  if (targetTimestamp < earliestBlock.timestamp) {
+  if (targetTimestamp < earliestBlock.timestamp * 1000) {
     throw new Error("Timestamp is earlier than the first block");
   }
 
-  if (targetTimestamp > latestBlock.timestamp) {
+  if (targetTimestamp > latestBlock.timestamp * 1000) {
     throw new Error("Timestamp is in the future");
   }