Merge branch 'main' into feat/add-custom-resource

TERITORI · Feb 19, 2025 · 88e41fd · 88e41fd
2 parents 52fb1b5 + a047053
commit 88e41fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/packages/hooks/useNSNameInfo.ts b/packages/hooks/useNSNameInfo.ts
@@ -9,7 +9,11 @@ import {
   getNetwork,
 } from "@/networks";
 import { getCosmosNameServiceQueryClient } from "@/utils/contracts";
-import { derivePkgAddr, extractGnoString } from "@/utils/gno";
+import {
+  derivePkgAddr,
+  extractGnoAddress,
+  extractGnoString,
+} from "@/utils/gno";
 import { ProfileData } from "@/utils/upp";
 
 export const GNO_CONTRACT_FIELD = {
@@ -159,7 +163,7 @@ const gnoGetAddressByUsername = async (
       network.nameServiceContractAddress,
       `GetUserByName(${JSON.stringify(name)}).Address`,
     );
-    const address = extractGnoString(res);
+    const address = extractGnoAddress(res);
     return address;
   } catch (err) {
     if (

diff --git a/packages/utils/gno.ts b/packages/utils/gno.ts
@@ -119,6 +119,16 @@ export const adenaAddPkg = async (
 export const extractGnoNumber = (str: string) => {
   return parseFloat(str.slice("(".length).split(" ")[0]);
 };
+export const extractGnoAddress = (str: string) => {
+  console.log("extracting address", str);
+  const jsonStr = str.slice("(".length, -" std.Address)".length);
+  if (!jsonStr) {
+    return "";
+  }
+  // FIXME: sanitize
+  // eslint-disable-next-line no-restricted-syntax
+  return JSON.parse(jsonStr) as string;
+};
 export const extractGnoString = (str: string) => {
   console.log("extracting string from", str);
   const jsonStr = str.slice("(".length, -" string)".length);