refactor: hb migration

src/routes/popup/agents/ao-yield/confirm-agent.tsx

@@ -99,6 +99,10 @@ export function ConfirmAOYieldAgentView() {
             name: "Slippage",
             value: aoYieldAgent.slippage.toString(),
           },
+          {
+            name: "Agent-Version",
+            value: AGENT_VERSION,
+          },
         ],
         forceSpawn: true,
       });

src/routes/popup/agents/components/AOYieldAgentListItem.tsx

@@ -63,7 +63,7 @@ const AOYieldAgentCreateListItem = () => {
 const AOYieldAgentActiveListItem = ({ aoAgent, isHistory }: AOYieldAgentListItemProps) => {
   const { navigate } = useLocation();
   const { data: mintingStatus } = useAOMintingStatus();
-  const { data: agentInfo } = useAOYieldAgentInfo(aoAgent?.id);
+  const { data: agentInfo } = useAOYieldAgentInfo(aoAgent?.id, aoAgent?.version);
   const theme = useTheme();
 
   useAsyncEffect(async () => {

src/utils/agents/constants.ts

@@ -24,4 +24,4 @@ export const AO_YIELD_AGENT_RECENT_TXS_CHECK_ALARM_NAME = "ao-yield-agent-recent
 export const AO_YIELD_AGENT_SYNC_ALARM_NAME_PREFIX = "ao-yield-agent-sync-alarm-";
 export const AO_YIELD_AGENT_SYNC_STATUS_PREFIX_KEY = "ao-yield-agent-sync-status-";
 
-export const AGENT_VERSION = "1.0.0";
+export const AGENT_VERSION = "1.0.2";

src/utils/agents/hooks.ts

@@ -82,10 +82,10 @@ export function useAOYieldAgent(agentId: string, status?: AOYieldAgentStatus) {
   }, [agents, agentId, status]);
 }
 
-export function useAOYieldAgentInfo(agentId: string) {
+export function useAOYieldAgentInfo(agentId: string, currentAgentVersion?: string) {
   return useQuery<AOYieldAgentInfo>({
     queryKey: ["ao-yield-agent-info", agentId],
-    queryFn: () => getAOYieldAgentInfo(agentId),
+    queryFn: () => getAOYieldAgentInfo(agentId, currentAgentVersion),
     enabled: !!agentId,
     refetchInterval: 60_000,
     staleTime: 60_000,

src/utils/agents/swap.ts

@@ -475,7 +475,7 @@ async function processAgentSwap(agent: AOYieldAgent, walletAddress: string): Pro
     // Fetch fresh agent info
     const agentInfo = await queryClient.fetchQuery({
       queryKey: ["ao-yield-agent-info", agent.id],
-      queryFn: () => getAOYieldAgentInfo(agent.id),
+      queryFn: () => getAOYieldAgentInfo(agent.id, agent.version),
       staleTime: 0, // Force fresh data
       gcTime: 0,
       retry: 3,

src/utils/agents/sync.ts

@@ -15,6 +15,7 @@ import { pLimit } from "plimit-lit";
 import { ExtensionStorage } from "~utils/storage";
 import { queryClient } from "~utils/tanstack";
 import { isWalletUnlocked } from "~wallets/auth";
+import { getTagValue } from "~tokens/aoTokens/ao";
 
 const limit = pLimit(10);
 
@@ -52,24 +53,27 @@ export async function checkAndSyncAgents(address: string): Promise<void> {
       return aDate.getTime() - bDate.getTime();
     });
 
-    const agentIds = sortedEdges.map((edge) => edge.node.id);
+    const foundAgents = sortedEdges.map((edge) => {
+      const agentVersion = getTagValue("Agent-Version", edge?.node?.tags) || "1.0.0";
+      return { agentId: edge.node.id, agentVersion };
+    });
 
     // Set extension storage values immediately since we know agents exist
     await ExtensionStorage.set(HAS_SHOWN_AGENTS_EXPLAINER_POPUP, true);
     await ExtensionStorage.set(SHOW_CREATE_WANDER_AGENT_CTA, false);
 
     // Read existing agents once and maintain ordered slots
     const currentAgents = await getAOYieldAgents(address);
-    const agentSlots: (AOYieldAgent | null)[] = new Array(agentIds.length).fill(null);
+    const agentSlots: (AOYieldAgent | null)[] = new Array(foundAgents.length).fill(null);
     let successCount = 0;
 
-    const agentInfoPromises = agentIds.map((agentId, index) =>
+    const agentInfoPromises = foundAgents.map(({ agentId, agentVersion }, index) =>
       limit(async () => {
         try {
           log(LOG_GROUP.AGENTS, `Fetching agent info for ${agentId}`);
           const agentInfo = await queryClient.fetchQuery({
             queryKey: ["ao-yield-agent-info", agentId],
-            queryFn: () => getAOYieldAgentInfo(agentId),
+            queryFn: () => getAOYieldAgentInfo(agentId, agentVersion),
             staleTime: 0, // Force fresh data
             gcTime: 0,
             retry: 1,
@@ -105,7 +109,7 @@ export async function checkAndSyncAgents(address: string): Promise<void> {
           const orderedNewAgents = agentSlots.filter((agent): agent is AOYieldAgent => agent !== null);
           await setAOYieldAgents(address, [...currentAgents, ...orderedNewAgents]);
           successCount++;
-          log(LOG_GROUP.AGENTS, `Agent ${agentId} added at position ${index} (${successCount}/${agentIds.length})`);
+          log(LOG_GROUP.AGENTS, `Agent ${agentId} added at position ${index} (${successCount}/${foundAgents.length})`);
 
           return agent;
         } catch (error) {

src/utils/agents/utils/index.ts

@@ -30,6 +30,33 @@ const agentStorageMutex = new Mutex();
  */
 export const arweave = Arweave.init(defaultGateway);
 
+/**
+ * Checks if version a is greater than or equal to version b
+ * @param a - The first version to compare
+ * @param b - The second version to compare
+ * @returns True if version a is greater than or equal to version b, false otherwise
+ */
+function isVersionGte(a: string, b: string): boolean {
+  try {
+    const pa = a.split(".").map(Number);
+    const pb = b.split(".").map(Number);
+    const len = Math.max(pa.length, pb.length);
+
+    for (let i = 0; i < len; i++) {
+      const na = pa[i] ?? 0;
+      const nb = pb[i] ?? 0;
+
+      if (na > nb) return true;
+      if (na < nb) return false;
+    }
+
+    return true; // Equal versions
+  } catch (error) {
+    console.error("Error comparing versions: ", a, b, error);
+    return false;
+  }
+}
+
 /**
  * Parses a gateway URL and returns an object containing the host, port, and protocol.
  *
@@ -232,55 +259,121 @@ export async function getAOYieldActiveAgent() {
   return agents[agents.length - 1];
 }
 
-export async function getAOYieldAgentInfo(agentId: string) {
-  const aoInstance = connect(defaultConfig);
+export async function getAOYieldAgentInfo(agentId: string, currentAgentVersion?: string) {
+  try {
+    if (currentAgentVersion && isVersionGte(currentAgentVersion, "1.0.2")) {
+      throw new Error("Fetch agent info from the HB node");
+    }
+
+    const aoInstance = connect(defaultConfig);
 
-  const dryrunRes = await aoInstance.dryrun({
-    Id,
-    Owner,
-    process: agentId,
-    tags: [{ name: "Action", value: "Info" }],
-  });
+    const dryrunRes = await aoInstance.dryrun({
+      Id,
+      Owner,
+      process: agentId,
+      tags: [{ name: "Action", value: "Info" }],
+    });
 
-  const message = dryrunRes.Messages?.[0];
-  const tags = message?.Tags;
-
-  const dex = getTagValue("Dex", tags);
-  const status = getTagValue("Status", tags);
-  const tokenOut = getTagValue("Token-Out", tags);
-  const conversionPercentage = getTagValue("Conversion-Percentage", tags);
-  const startDate = getTagValue("Start-Date", tags);
-  const endDate = getTagValue("End-Date", tags);
-  const runIndefinitely = getTagValue("Run-Indefinitely", tags);
-  const slippage = getTagValue("Slippage", tags);
-  const totalAOSold = getTagValue("Total-AO-Sold", tags);
-  const totalBought = getTagValue("Total-Bought", tags);
-  const totalTransactions = getTagValue("Total-Transactions", tags);
-  const totalWanderFee = getTagValue("Total-Wander-Fee", tags);
-  const swapInProgress = getTagValue("Swap-In-Progress", tags);
-  const processedUpToDate = getTagValue("Processed-Up-To-Date", tags);
-  const swappedUpToDate = getTagValue("Swapped-Up-To-Date", tags);
-  const agentVersion = getTagValue("Agent-Version", tags);
+    const message = dryrunRes.Messages?.[0];
+    const tags = message?.Tags;
+
+    const dex = getTagValue("Dex", tags);
+    const status = getTagValue("Status", tags);
+    const tokenOut = getTagValue("Token-Out", tags);
+    const conversionPercentage = getTagValue("Conversion-Percentage", tags);
+    const startDate = getTagValue("Start-Date", tags);
+    const endDate = getTagValue("End-Date", tags);
+    const runIndefinitely = getTagValue("Run-Indefinitely", tags);
+    const slippage = getTagValue("Slippage", tags);
+    const totalAOSold = getTagValue("Total-AO-Sold", tags);
+    const totalBought = getTagValue("Total-Bought", tags);
+    const totalTransactions = getTagValue("Total-Transactions", tags);
+    const totalWanderFee = getTagValue("Total-Wander-Fee", tags);
+    const swapInProgress = getTagValue("Swap-In-Progress", tags);
+    const processedUpToDate = getTagValue("Processed-Up-To-Date", tags);
+    const swappedUpToDate = getTagValue("Swapped-Up-To-Date", tags);
+    const agentVersion = getTagValue("Agent-Version", tags);
 
-  return {
-    id: agentId,
-    status,
-    dex,
-    tokenOut,
-    conversionPercentage: Number(conversionPercentage),
-    startDate: Number(startDate),
-    endDate: Number(endDate),
-    runIndefinitely: runIndefinitely === "true",
-    slippage: Number(slippage),
-    totalAOSold,
-    totalBought: JSON.parse(totalBought),
-    totalTransactions: Number(totalTransactions),
-    totalWanderFee,
-    swapInProgress: swapInProgress === "true",
-    processedUpToDate: processedUpToDate !== "nil" ? Number(processedUpToDate) : undefined,
-    swappedUpToDate: swappedUpToDate !== "nil" ? Number(swappedUpToDate) : undefined,
-    agentVersion,
-  } as AOYieldAgentInfo;
+    return {
+      id: agentId,
+      status,
+      dex,
+      tokenOut,
+      conversionPercentage: Number(conversionPercentage),
+      startDate: Number(startDate),
+      endDate: Number(endDate),
+      runIndefinitely: runIndefinitely === "true",
+      slippage: Number(slippage),
+      totalAOSold,
+      totalBought: JSON.parse(totalBought),
+      totalTransactions: Number(totalTransactions),
+      totalWanderFee,
+      swapInProgress: swapInProgress === "true",
+      processedUpToDate: processedUpToDate && processedUpToDate !== "nil" ? Number(processedUpToDate) : undefined,
+      swappedUpToDate: swappedUpToDate && swappedUpToDate !== "nil" ? Number(swappedUpToDate) : undefined,
+      agentVersion,
+    } as AOYieldAgentInfo;
+  } catch (error) {
+    if (!isVersionGte(currentAgentVersion, "1.0.2")) {
+      throw new Error("Agent version is required & must be greater than 1.0.2");
+    }
+
+    console.log("Fetching agent info from the HB node with agent version: ", currentAgentVersion);
+    // TODO: Update this with the actual HB node
+    const response = await fetch(
+      `http://localhost:10000/${agentId}/~process@1.0/now/agent-info/~json@1.0/serialize?bundle`,
+    );
+    if (!response.ok) {
+      throw new Error("Failed to fetch agent info");
+    }
+    const data = await response.json();
+
+    const dex = data.dex;
+    const status = data.status;
+    const tokenOut = data.tokenOut ?? data.tokenout;
+    const conversionPercentage = data.conversionPercentage ?? data.conversionpercentage;
+    const startDate = data.startDate ?? data.startdate;
+    const endDate = data.endDate ?? data.enddate;
+    const runIndefinitely = data.runIndefinitely ?? data.runindefinitely;
+    const slippage = data.slippage ?? data.slippage;
+    const totalAOSold = data.totalAOSold ?? data.totalaosold;
+    const totalBought = data.totalBought ?? data.totalbought;
+    const totalTransactions = data.totalTransactions ?? data.totaltransactions;
+    const totalWanderFee = data.totalWanderFee ?? data.totalwanderfee;
+    const swapInProgress = data.swapInProgress ?? data.swapinprogress;
+    const processedUpToDate = data.processedUpToDate ?? data.processeduptodate;
+    const swappedUpToDate = data.swappedUpToDate ?? data.swappeduptodate;
+    const agentVersion = data.agentVersion ?? data.agentversion;
+
+    let totalBoughtObj = {};
+    if (typeof totalBought === "object" && totalBought !== null) {
+      totalBoughtObj = totalBought;
+    } else {
+      try {
+        totalBoughtObj = JSON.parse(totalBought);
+      } catch {}
+    }
+
+    return {
+      id: agentId,
+      status,
+      dex,
+      tokenOut,
+      conversionPercentage: Number(conversionPercentage),
+      startDate: Number(startDate),
+      endDate: Number(endDate),
+      runIndefinitely: runIndefinitely === "true",
+      slippage: Number(slippage),
+      totalAOSold,
+      totalBought: totalBoughtObj,
+      totalTransactions: Number(totalTransactions),
+      totalWanderFee,
+      swapInProgress: swapInProgress === "true",
+      processedUpToDate: processedUpToDate && processedUpToDate !== "nil" ? Number(processedUpToDate) : undefined,
+      swappedUpToDate: swappedUpToDate && swappedUpToDate !== "nil" ? Number(swappedUpToDate) : undefined,
+      agentVersion,
+    } as AOYieldAgentInfo;
+  }
 }
 
 /**

src/utils/log/log.utils.ts

@@ -32,8 +32,8 @@ const LOG_GROUPS_ENABLED: Record<LOG_GROUP, boolean> = {
   [LOG_GROUP.WALLET_GENERATION]: false,
   [LOG_GROUP.SESSION]: false,
   [LOG_GROUP.STORAGE]: false,
-  [LOG_GROUP.AGENTS]: false,
-  [LOG_GROUP.TIERS]: false,
+  [LOG_GROUP.AGENTS]: process.env.NODE_ENV === "development",
+  [LOG_GROUP.TIERS]: process.env.NODE_ENV === "development",
   [LOG_GROUP.TRANSAK]: false,
   [LOG_GROUP.FAIR_LAUNCH]: false,
   [LOG_GROUP.TRANSACTIONS]: false,

src/utils/tier/utils.ts

@@ -69,27 +69,55 @@ export async function getActiveTier(walletAddress: string, retry = false): Promi
 
     data = responseData;
   } catch {
-    const dryrunParams = {
-      Id,
-      Owner: walletAddress,
-      process: TIER_PROCESS_ID,
-      tags: [{ name: "Action", value: "Get-Wallet-Info" }],
-    };
+    // TODO: Update this with the actual HB node & process ID
+    const url = `http://localhost:10000/QC6z9NZYtVYn0Elx40iUmeIYvzKvuqk-OmfoleUxpSQ~process@1.0/now/wallets-tier-info/${walletAddress}/~json@1.0/serialize`;
 
-    const dryrunRes = retry
+    const response = retry
       ? await retryWithDelay(
-          () => dryrun(dryrunParams),
+          async () => {
+            const response = await fetch(url);
+            console.log(response.ok, response.status, typeof response.status);
+            if (!response.ok && response.status !== 404) {
+              throw new Error("Failed to fetch tier info from HB node");
+            }
+            return response;
+          },
           3,
           1000,
           (attempt) => Math.min(1000 * 2 ** attempt, 30000),
         )
-      : await dryrun(dryrunParams);
-
-    const message = dryrunRes.Messages?.[0];
-    const parsedData = JSON.parse(message?.Data || "{}");
+      : await fetch(url);
+
+    let parsedData: ActiveTierFromApi;
+
+    if (response.status === 404) {
+      // TODO: Update this with the actual HB node
+      const response = await fetch(
+        `http://localhost:10000/QC6z9NZYtVYn0Elx40iUmeIYvzKvuqk-OmfoleUxpSQ~process@1.0/now/tier-info/~json@1.0/serialize`,
+      );
+      const responseData = await response.json();
+      parsedData = {
+        balance: "0",
+        progress: 0,
+        rank: "",
+        snapshotTimestamp: responseData.snapshotTimestamp,
+        tier: 5,
+        totalHolders: responseData.totalHolders,
+      } as ActiveTierFromApi;
+    } else {
+      const responseData = await response.json();
+      parsedData = {
+        balance: responseData.balance,
+        progress: responseData.progress,
+        rank: responseData.rank,
+        snapshotTimestamp: responseData.snapshotTimestamp,
+        tier: responseData.tier,
+        totalHolders: responseData.totalHolders,
+      } as ActiveTierFromApi;
+    }
 
     if (!isValidTierInfo(parsedData)) {
-      throw new Error("Invalid tier info data from WNDR tier process");
+      throw new Error("Invalid tier info data from HB node");
     }
 
     data = parsedData;