Merge pull request #286 from helius-labs/fix/token-routing-2

[Fix] Token Routing
helius-labs · Feb 13, 2024 · 76aa736 · 76aa736
2 parents 1886ad4 + f584768
commit 76aa736
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/src/lib/xray/lib/search.ts b/src/lib/xray/lib/search.ts
@@ -59,25 +59,16 @@ export const search = async (
     if (isValidPublicKey(query)) {
         const pubkey = new PublicKey(query);
         const account = await connection.getAccountInfo(pubkey);
-        // TODO Property 'program' does not exist on type 'Buffer | ParsedAccountData'.
-        // @ts-ignore
-        const program = account?.value?.data?.program;
-        // @ts-ignore
-        const parsedType = account?.value?.data?.parsed?.type;
-
-        /*
-         * spl-token      -> spl token
-         * spl-token-2022 -> token 2022
-         * null           -> compressed nft
-         */
+        const program = account?.owner.toString();
+
         const probablyToken =
-            program === "spl-token" ||
-            program === "spl-token-2022" ||
-            account?.value === null;
+            program === "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA" ||
+            program === "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb" ||
+            account === null;
 
         let addressType!: "token" | "account";
         if (probablyToken) {
-            addressType = parsedType === "account" ? "account" : "token";
+            addressType = "token";
         }
         addressType ??= "account";