Merge pull request #703 from alleslabs/feat/v1-contract-query-msgs

v1 contract query msgs

CHANGELOG.md

@@ -43,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
+- [#703](https://github.com/alleslabs/celatone-frontend/pull/703) api v1 - contract's query msgs
 - [#697](https://github.com/alleslabs/celatone-frontend/pull/697) api v1 - contract tables (migrations and related proposals)
 - [#696](https://github.com/alleslabs/celatone-frontend/pull/696) api v1 - block details
 - [#695](https://github.com/alleslabs/celatone-frontend/pull/695) api v1 - contract states

src/lib/app-provider/env.ts

@@ -15,7 +15,7 @@ export enum CELATONE_QUERY_KEYS {
   CONTRACT_DETAIL_BY_CONTRACT_ADDRESS = "CELATONE_QUERY_CONTRACT_DETAIL_BY_CONTRACT_ADDRESS",
   CONTRACT_CW2_INFO = "CELATONE_QUERY_CONTRACT_CW2_INFO",
   CONTRACT_INFO = "CELATONE_QUERY_CONTRACT_INFO",
-  CONTRACT_QUERY_CMDS = "CELATONE_QUERY_CONTRACT_QUERY_CMDS",
+  CONTRACT_QUERY_MSGS = "CELATONE_QUERY_CONTRACT_QUERY_MSGS",
   CONTRACT_QUERY = "CELATONE_QUERY_CONTRACT_QUERY",
   CONTRACT_STATE = "CELATONE_QUERY_CONTRACT_STATE",
   // ACCOUNT

src/lib/hooks/index.ts

@@ -1,7 +1,6 @@
 export * from "./useCodeFilter";
 export * from "./useExecuteCmds";
 export * from "./useHandleSave";
-export * from "./useQueryCmds";
 export * from "./useRedo";
 export * from "./useSingleMessageProps";
 export * from "./useToast";

src/lib/pages/contract-details/components/CommandSection.tsx

@@ -19,8 +19,9 @@ import {
   ViewSchemaModal,
 } from "lib/components/json-schema";
 import { Tooltip } from "lib/components/Tooltip";
-import { useExecuteCmds, useQueryCmds } from "lib/hooks";
+import { useExecuteCmds } from "lib/hooks";
 import { useSchemaStore } from "lib/providers/store";
+import { useContractQueryMsgs } from "lib/services/contractService";
 import type { ContractAddr } from "lib/types";
 import { encode, jsonPrettify } from "lib/utils";
 
@@ -94,8 +95,8 @@ export const CommandSection = observer(
     const jsonSchema = getSchemaByCodeHash(codeHash);
     const attached = Boolean(jsonSchema);
 
-    const { isFetching: isQueryCmdsFetching, queryCmds } =
-      useQueryCmds(contractAddress);
+    const { isFetching: isQueryCmdsFetching, data: queryCmds = [] } =
+      useContractQueryMsgs(contractAddress);
     const { isFetching: isExecuteCmdsFetching, execCmds } =
       useExecuteCmds(contractAddress);
 

src/lib/pages/query/components/JsonQuery.tsx

@@ -17,9 +17,9 @@ import JsonInput from "lib/components/json/JsonInput";
 import JsonReadOnly from "lib/components/json/JsonReadOnly";
 import { LoadingOverlay } from "lib/components/LoadingOverlay";
 import { DEFAULT_RPC_ERROR } from "lib/data";
-import { useQueryCmds } from "lib/hooks";
 import { useContractStore } from "lib/providers/store";
 import { queryData } from "lib/services/contract";
+import { useContractQueryMsgs } from "lib/services/contractService";
 import type { ContractAddr, HumanAddr, RpcQueryError } from "lib/types";
 import {
   jsonPrettify,
@@ -42,7 +42,8 @@ interface JsonQueryProps {
 }
 
 export const JsonQuery = ({ contractAddress, initialMsg }: JsonQueryProps) => {
-  const { isFetching: cmdsFetching, queryCmds } = useQueryCmds(contractAddress);
+  const { isFetching: cmdsFetching, data: queryCmds = [] } =
+    useContractQueryMsgs(contractAddress);
   const lcdEndpoint = useBaseApiRoute("rest");
   const { addActivity } = useContractStore();
   const { address } = useCurrentChain();

src/lib/services/contract.ts

@@ -199,3 +199,19 @@ export const getContractTableCounts = async (
       },
     })
     .then((res) => zContractTableCounts.parse(res.data));
+
+const zContractQueryMsgs = z
+  .object({
+    query: z.array(z.string()),
+  })
+  .transform((val) =>
+    val.query.map<[string, string]>((msg) => [msg, `{"${msg}": {}}`])
+  );
+
+export const getContractQueryMsgs = async (
+  endpoint: string,
+  contractAddress: ContractAddr
+) =>
+  axios
+    .get(`${endpoint}/${encodeURIComponent(contractAddress)}/query-msgs`)
+    .then(({ data }) => zContractQueryMsgs.parse(data));

src/lib/services/contractService.ts

@@ -35,6 +35,7 @@ import { parseTxHashOpt, parseDateOpt } from "lib/utils";
 import { getCodeIdInfo } from "./code";
 import {
   getAdminContractsByAddress,
+  getContractQueryMsgs,
   getContractTableCounts,
   getInstantiatedContractsByAddress,
   getMigrationHistoriesByContractAddress,
@@ -456,3 +457,13 @@ export const useContractTableCounts = (
     { enabled: !!address, retry: 1, refetchOnWindowFocus: false }
   );
 };
+
+export const useContractQueryMsgs = (contractAddress: ContractAddr) => {
+  const endpoint = useBaseApiRoute("contracts");
+
+  return useQuery(
+    [CELATONE_QUERY_KEYS.CONTRACT_QUERY_MSGS, endpoint, contractAddress],
+    async () => getContractQueryMsgs(endpoint, contractAddress),
+    { retry: false, cacheTime: 0, refetchOnWindowFocus: false }
+  );
+};