Migrate GraphQL to API

CHANGELOG.md

@@ -41,6 +41,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#1136](https://github.com/alleslabs/celatone-frontend/pull/1136) Update code to get data from API instead of GraphQL
+- [#1132](https://github.com/alleslabs/celatone-frontend/pull/1132) Update account type to get data from API instead of GraphQL
+
 ### Bug fixes
 
 - [#1137](https://github.com/alleslabs/celatone-frontend/pull/1137) Bump axios and remove initia js client usage

src/lib/app-provider/env.ts

@@ -14,7 +14,6 @@ export enum CELATONE_QUERY_KEYS {
   // ACCOUNT
   ACCOUNT_DATA = "CELATONE_QUERY_ACCOUNT_DATA",
   ACCOUNT_TYPE = "CELATONE_QUERY_ACCOUNT_TYPE",
-  ACCOUNT_TYPE_LCD = "CELATONE_QUERY_ACCOUNT_TYPE_LCD",
   ACCOUNT_BECH_32_LCD = "CELATONE_QUERY_ACCOUNT_BECH_32_LCD",
   // ASSET
   ASSET_INFOS = "CELATONE_QUERY_ASSET_INFOS",
@@ -31,7 +30,7 @@ export enum CELATONE_QUERY_KEYS {
   CODES_LCD = "CELATONE_QUERY_CODES_LCD",
   CODES_BY_ADDRESS = "CELATONE_QUERY_CODES_BY_ADDRESS",
   ALL_CODES_BY_ADDRESS = "CELATONE_QUERY_ALL_CODES_BY_ADDRESS",
-  CODES_BY_IDS = "CELATONE_QUERY_CODES_BY_IDS",
+  CODE_LIST = "CELATONE_QUERY_CODE_LIST",
   CODE_DATA = "CELATONE_QUERY_CODE_DATA",
   CODE_DATA_LCD = "CELATONE_QUERY_CODE_DATA_LCD",
   // CONTRACT

src/lib/components/modal/account/SaveNewAccount.tsx

@@ -9,7 +9,6 @@ import {
   useCelatoneApp,
   useExampleAddresses,
   useMoveConfig,
-  useTierConfig,
   useValidateAddress,
   useWasmConfig,
 } from "lib/app-provider";
@@ -18,7 +17,7 @@ import { ControllerInput, ControllerTextarea } from "lib/components/forms";
 import { useGetMaxLengthError, useHandleAccountSave } from "lib/hooks";
 import { useFormatAddresses } from "lib/hooks/useFormatAddresses";
 import { useAccountStore } from "lib/providers/store";
-import { useAccountType, useAccountTypeLcd } from "lib/services/account";
+import { useAccountType } from "lib/services/account";
 import type { BechAddr } from "lib/types";
 import { AccountType } from "lib/types";
 
@@ -49,7 +48,6 @@ export function SaveNewAccountModal({
   publicDescription,
 }: SaveNewAccountModalProps) {
   const { constants } = useCelatoneApp();
-  const { isFullTier } = useTierConfig();
   const { user: exampleUserAddress } = useExampleAddresses();
   const { isSomeValidAddress } = useValidateAddress();
   const formatAddresses = useFormatAddresses();
@@ -109,20 +107,12 @@ export function SaveNewAccountModal({
     setErrorStatus(err.message);
   };
 
-  const { refetch: refetchLite } = useAccountTypeLcd(addressState, {
+  const { refetch } = useAccountType(addressState, {
     enabled: false,
     onSuccess,
     onError,
   });
 
-  const { refetch: refetchFull } = useAccountType(addressState, {
-    enabled: false,
-    onSuccess,
-    onError,
-  });
-
-  const refetch = isFullTier ? refetchFull : refetchLite;
-
   useEffect(() => {
     if (addressState.trim().length === 0) {
       setStatus({

src/lib/model/code.ts

@@ -4,10 +4,7 @@ import { useCurrentChain } from "lib/app-provider";
 import type { PermissionFilterValue } from "lib/hooks";
 import { useCodePermissionFilter, useCodeSearchFilter } from "lib/hooks";
 import { useCodeStore } from "lib/providers/store";
-import {
-  useAllCodesByAddress,
-  useCodeListByCodeIds,
-} from "lib/services/wasm/code";
+import { useAllCodesByAddress, useCodeList } from "lib/services/wasm/code";
 import type { BechAddr, CodeInfo } from "lib/types";
 import { AccessConfigPermission } from "lib/types";
 
@@ -33,10 +30,10 @@ const useSavedCodes = () => {
   const { lastSavedCodes, lastSavedCodeIds, isHydrated } = useCodeStore();
 
   const savedCodeIds = lastSavedCodeIds();
-  const { data: rawSavedCodes, isLoading } = useCodeListByCodeIds(savedCodeIds);
+  const { data: rawSavedCodes, isLoading } = useCodeList(savedCodeIds);
 
   const savedCodes = lastSavedCodes().map<CodeInfo>((localSavedCode) => {
-    const rawSavedCode = rawSavedCodes?.find(
+    const rawSavedCode = rawSavedCodes?.items.find(
       (savedCode) => savedCode.id === localSavedCode.id
     );
     return {

src/lib/query/index.ts

@@ -1,9 +1,7 @@
 export * from "./block";
-export * from "./code";
 export * from "./contract";
 export * from "./pool";
 export * from "./tx";
-export * from "./account";
 export * from "./collection";
 export * from "./collectionOld";
 export * from "./nft";

src/lib/services/account/api.ts

@@ -1,6 +1,10 @@
 import axios from "axios";
 
-import { zAccountData, zAccountTableCounts } from "../types";
+import {
+  zAccountData,
+  zAccountTableCounts,
+  zAccountTypeResponse,
+} from "../types";
 import type { AccountData, AccountTableCounts } from "../types";
 import type { BechAddr } from "lib/types";
 import { parseWithError } from "lib/utils";
@@ -27,3 +31,8 @@ export const getAccountTableCounts = async (
       },
     })
     .then(({ data }) => parseWithError(zAccountTableCounts, data));
+
+export const getAccountType = async (endpoint: string, address: BechAddr) =>
+  axios
+    .get(`${endpoint}/${encodeURIComponent(address)}/type`)
+    .then(({ data }) => parseWithError(zAccountTypeResponse, data));

src/lib/services/account/index.ts

@@ -17,7 +17,7 @@ import {
 } from "lib/app-provider";
 import type { AccountType, BechAddr, Option } from "lib/types";
 
-import { getAccountData, getAccountTableCounts } from "./api";
+import { getAccountData, getAccountTableCounts, getAccountType } from "./api";
 import {
   getAccountBech32Lcd,
   getAccountDataLcd,
@@ -63,13 +63,15 @@ export const useAccountTableCounts = (
   );
 };
 
-export const useAccountTypeLcd = (
+export const useAccountType = (
   address: Option<BechAddr>,
   options: Pick<
     UseQueryOptions<AccountType, Error>,
     "enabled" | "onSuccess" | "onError"
   > = {}
 ): UseQueryResult<AccountType> => {
+  const { isFullTier } = useTierConfig();
+  const apiEndpoint = useBaseApiRoute("accounts");
   const lcdEndpoint = useLcdEndpoint();
 
   const queryFn = useCallback(async () => {
@@ -78,11 +80,13 @@ export const useAccountTypeLcd = (
         "Fetching account type: failed to retrieve address. (useAccountTypeLcd)"
       );
 
+    if (isFullTier) return getAccountType(apiEndpoint, address);
+
     return getAccountTypeLcd(lcdEndpoint, address);
-  }, [lcdEndpoint, address]);
+  }, [lcdEndpoint, address, apiEndpoint, isFullTier]);
 
   return useQuery(
-    [CELATONE_QUERY_KEYS.ACCOUNT_TYPE_LCD, lcdEndpoint, address],
+    [CELATONE_QUERY_KEYS.ACCOUNT_TYPE, apiEndpoint, lcdEndpoint, address],
     queryFn,
     {
       ...options,
@@ -103,5 +107,3 @@ export const useAccountBech32 = (
       refetchOnWindowFocus: false,
     }
   );
-
-export * from "./gql";

src/lib/services/types/account.ts

@@ -1,6 +1,11 @@
 import { z } from "zod";
 
-import { AccountTypeLcd, zProjectInfo, zPublicAccountInfo } from "lib/types";
+import {
+  AccountType,
+  AccountTypeLcd,
+  zProjectInfo,
+  zPublicAccountInfo,
+} from "lib/types";
 import { snakeToCamel } from "lib/utils";
 
 const zIcns = z.object({
@@ -38,6 +43,12 @@ export const zAccountTypeLcd = z
   })
   .transform((data) => data.account["@type"]);
 
+export const zAccountTypeResponse = z
+  .object({
+    type: z.nativeEnum(AccountType),
+  })
+  .transform((val) => val.type);
+
 export const zAccountBech32LcdResponse = z
   .object({
     bech32_prefix: z.string(),

src/lib/services/types/wasm/code.ts

@@ -53,15 +53,7 @@ const zCodesResponseItem = z
     instantiate_permission: z.nativeEnum(AccessConfigPermission),
     permission_addresses: z.array(zBechAddr),
   })
-  .transform<CodeInfo>((val) => ({
-    id: val.id,
-    cw2Contract: val.cw2_contract,
-    cw2Version: val.cw2_version,
-    uploader: val.uploader,
-    contractCount: val.contract_count,
-    instantiatePermission: val.instantiate_permission,
-    permissionAddresses: val.permission_addresses,
-  }));
+  .transform<CodeInfo>(snakeToCamel);
 
 export const zCodesResponse = z.object({
   items: z.array(zCodesResponseItem),
@@ -163,3 +155,7 @@ export const zCodeInfoResponseLcd = z
       uploader: creator,
     })
   );
+
+export const zCodeListResponse = z.object({
+  items: z.array(zCodesResponseItem),
+});

src/lib/services/wasm/code/api.ts

@@ -1,6 +1,10 @@
 import axios from "axios";
 
-import { zCodeData, zCodesResponse } from "lib/services/types";
+import {
+  zCodeData,
+  zCodeListResponse,
+  zCodesResponse,
+} from "lib/services/types";
 import type { CodeData, CodesResponse } from "lib/services/types";
 import type { BechAddr, BechAddr20, Option } from "lib/types";
 import { parseWithError } from "lib/utils";
@@ -58,3 +62,12 @@ export const getCodeData = async (
       },
     })
     .then(({ data }) => parseWithError(zCodeData, data));
+
+export const getCodeList = async (endpoint: string, codeIds: number[]) =>
+  axios
+    .get(`${endpoint}/list`, {
+      params: {
+        code_ids: codeIds.join(","),
+      },
+    })
+    .then(({ data }) => parseWithError(zCodeListResponse, data));