Merge pull request #1113 from wanderwallet/refactor/update-ario-logo

refactor: update ario logo

Author: pawanpaudel93

src/api/background/handlers/alarms/ao-tokens-cache/ao-tokens-cache-alarm.handler.ts

@@ -1,9 +1,8 @@
-import { dryrun } from "@permaweb/aoconnect";
 import { PersistentStorage } from "~utils/storage";
 import type { Alarms } from "webextension-polyfill";
-import { type TokenInfo, getTokenInfoFromData } from "~tokens/aoTokens/ao";
+import { type TokenInfo, getTokenInfo } from "~tokens/aoTokens/ao";
 import { timeoutPromise } from "~utils/promises/timeout";
-import { AR_PROCESS_ID, Id, Owner } from "~tokens/aoTokens/ao.constants";
+import { AR_PROCESS_ID } from "~tokens/aoTokens/ao.constants";
 
 /**
  * Alarm handler for syncing ao tokens
@@ -18,29 +17,18 @@ export const handleAoTokenCacheAlarm = async (alarmInfo?: Alarms.Alarm) => {
   for (const token of aoTokens) {
     if (token.processId === AR_PROCESS_ID) continue;
     try {
-      const res = await timeoutPromise(
-        dryrun({
-          Id,
-          Owner,
-          process: token.processId,
-          tags: [{ name: "Action", value: "Info" }],
-        }),
-        6000,
-      );
+      const tokenInfo = await timeoutPromise(getTokenInfo(token.processId), 6000);
 
-      if (res.Messages && Array.isArray(res.Messages)) {
-        const tokenInfo = getTokenInfoFromData(res, token.processId);
-        const updatedToken = {
-          ...tokenInfo,
-          lastUpdated: new Date().toISOString(),
-        };
+      const updatedToken = {
+        ...tokenInfo,
+        lastUpdated: new Date().toISOString(),
+      };
 
-        if (updatedToken) {
-          const index = updatedTokens.findIndex((t) => t.processId === token.processId);
+      if (updatedToken) {
+        const index = updatedTokens.findIndex((t) => t.processId === token.processId);
 
-          if (index !== -1) {
-            updatedTokens[index] = { ...updatedTokens[index], ...updatedToken };
-          }
+        if (index !== -1) {
+          updatedTokens[index] = { ...updatedTokens[index], ...updatedToken };
         }
       }
     } catch (err) {

src/api/background/handlers/browser/install/install.handler.ts

@@ -49,6 +49,7 @@ export async function handleInstall(details: Runtime.OnInstalledDetailsType) {
 
   // initialize alarm to update tokens once a week
   browser.alarms.create("update_ao_tokens", {
+    delayInMinutes: 1,
     periodInMinutes: 10080,
   });
 

src/tokens/aoTokens/ao.ts

@@ -54,21 +54,23 @@ type DataItemResult = {
 const ao = connect(defaultConfig);
 
 export const ARDRIVE_CU_URL = "https://cu.ardrive.io";
-export const AO_DEV_CU_URL = "https://aodev.fun/ao/cu";
 export const DEFAULT_CU_URL = "https://cu.ao-testnet.xyz";
 
 const { dryrun: arDriveDryrun } = connect({ CU_URL: ARDRIVE_CU_URL });
-const { dryrun: aoDevDryrun } = connect({ CU_URL: AO_DEV_CU_URL });
 
 const ARDRIVE_PROCESSES = [ARIO_MAINNET_PROCESS_ID, ARIO_TESTNET_PROCESS_ID];
 
 export const getDryrunForProcess = (processId: string) => {
-  if (processId === UTD_PROCESS_ID) return { dryrunFn: aoDevDryrun, isCustomDryrun: true };
   if (ARDRIVE_PROCESSES.includes(processId)) return { dryrunFn: arDriveDryrun, isCustomDryrun: true };
 
   return { dryrunFn: dryrun, isCustomDryrun: false };
 };
 
+export const getCuUrlForProcess = (processId: string) => {
+  if (ARDRIVE_PROCESSES.includes(processId)) return ARDRIVE_CU_URL;
+  return DEFAULT_CU_URL;
+};
+
 export function getTokenInfoFromData(res: any, id: string): TokenInfo {
   // find message with token info
   for (const msg of res.Messages as Message[]) {
@@ -102,7 +104,7 @@ export function getTokenInfoFromData(res: any, id: string): TokenInfo {
     const Logo = getTagValue("Logo", msg.Tags);
     const Transferable = getTagValue("Transferable", msg.Tags);
 
-    if (!Ticker && !Name) continue;
+    if (!Ticker || !Name) continue;
 
     return {
       processId: id,
@@ -135,7 +137,7 @@ export async function getTokenInfo(id: string): Promise<TokenInfo> {
     return { ...data.tokenInfo, processId: id };
   } catch {
     // query ao
-    const dryrunFn = id === UTD_PROCESS_ID ? aoDevDryrun : dryrun;
+    const { dryrunFn } = getDryrunForProcess(id);
     const res = await dryrunFn({
       Id,
       Owner,

src/tokens/aoTokens/sync.ts

@@ -4,11 +4,10 @@ import { getAoTokensCache } from "~tokens";
 import type { GQLTransactionsResultInterface } from "ar-gql/dist/faces";
 import { PersistentStorage } from "~utils/storage";
 import { getActiveAddress } from "~wallets";
-import { type TokenInfo, getTokenInfoFromData, DEFAULT_CU_URL, AO_DEV_CU_URL } from "./ao";
+import { getTokenInfo, type TokenInfo } from "./ao";
 import { withRetry } from "~utils/promises/retry";
 import { timeoutPromise } from "~utils/promises/timeout";
 import { Mutex } from "~utils/mutex";
-import { Id, Owner, UTD_PROCESS_ID } from "~tokens/aoTokens/ao.constants";
 
 /** Tokens storage name */
 export const AO_TOKENS = "ao_tokens";
@@ -35,34 +34,6 @@ export const gateway = {
   protocol: "https",
 };
 
-async function getTokenInfo(id: string): Promise<TokenInfo> {
-  const body = {
-    Id,
-    Target: id,
-    Owner,
-    Anchor: "0",
-    Data: "1234",
-    Tags: [
-      { name: "Action", value: "Info" },
-      { name: "Data-Protocol", value: "ao" },
-      { name: "Type", value: "Message" },
-      { name: "Variant", value: "ao.TN.1" },
-    ],
-  };
-  const cuUrl = id === UTD_PROCESS_ID ? AO_DEV_CU_URL : DEFAULT_CU_URL;
-  const res = await (
-    await fetch(`${cuUrl}/dry-run?process-id=${id}`, {
-      headers: {
-        "content-type": "application/json",
-      },
-      body: JSON.stringify(body),
-      method: "POST",
-    })
-  ).json();
-
-  return getTokenInfoFromData(res, id);
-}
-
 // Get transactions for AO token discovery
 function getNoticeTransactionsQuery(address: string, filterProcesses: string[], minBlockHeight?: number) {
   const effectiveMinHeight = minBlockHeight || 1;