Feat(utils): move contracts service into new folder structure wasm

CHANGELOG.md

@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Features
 
+- [#925](https://github.com/alleslabs/celatone-frontend/pull/925) Move contracts service to new folder structure
 - [#919](https://github.com/alleslabs/celatone-frontend/pull/919) Remove singleStakingDenom config and use from lcd instead
 - [#918](https://github.com/alleslabs/celatone-frontend/pull/918) Support lite version for delegation informations
 - [#916](https://github.com/alleslabs/celatone-frontend/pull/916) Support lite version balances

src/lib/components/ContractSelectSection.tsx

@@ -5,8 +5,8 @@ import { useForm } from "react-hook-form";
 
 import { useMobile } from "lib/app-provider";
 import { useContractStore } from "lib/providers/store";
-import type { ContractDetail } from "lib/services/contractService";
-import { useContractDetailByContractAddress } from "lib/services/contractService";
+import type { ContractDetail } from "lib/services/types";
+import { useContractDetailByContractAddress } from "lib/services/wasm/contract";
 import type { ContractLocalInfo } from "lib/stores/contract";
 import type { BechAddr, BechAddr32, Option } from "lib/types";
 

src/lib/components/modal/contract/SaveNewContract.tsx

@@ -13,7 +13,7 @@ import { OffChainForm } from "lib/components/OffChainForm";
 import { INSTANTIATED_LIST_NAME } from "lib/data";
 import { useHandleContractSave } from "lib/hooks";
 import { useContractStore } from "lib/providers/store";
-import { useContractDetailByContractAddress } from "lib/services/contractService";
+import { useContractDetailByContractAddress } from "lib/services/wasm/contract";
 import type { BechAddr, BechAddr32, LVPair } from "lib/types";
 import {
   formatSlugName,

src/lib/components/select-contract/ContractListDetail.tsx

@@ -8,7 +8,7 @@ import { useCurrentChain } from "lib/app-provider";
 import { DisconnectedState, EmptyState, ZeroState } from "lib/components/state";
 import { TagSelection } from "lib/components/TagSelection";
 import { INSTANTIATED_LIST_NAME } from "lib/data";
-import { useAdminByContractAddresses } from "lib/services/contractService";
+import { useAdminByContractAddresses } from "lib/services/wasm/contract";
 import type { ContractListInfo } from "lib/stores/contract";
 import type { BechAddr32, ContractInfo } from "lib/types";
 import { formatSlugName } from "lib/utils";

src/lib/components/select-contract/SelectContractAdmin.tsx

@@ -15,7 +15,7 @@ import { useCurrentChain } from "lib/app-provider";
 import { CustomIcon } from "lib/components/icon";
 import { ADMIN_SPECIAL_SLUG } from "lib/data";
 import { useContractStore } from "lib/providers/store";
-import { useContractListByAdmin } from "lib/services/contractService";
+import { useContractListByAdmin } from "lib/services/wasm/contract";
 import type { ContractListInfo, ContractLocalInfo } from "lib/stores/contract";
 import type { BechAddr32 } from "lib/types";
 import { getCurrentDate } from "lib/utils";

src/lib/components/select-contract/SelectContractInstantiator.tsx

@@ -30,7 +30,7 @@ import {
 import { DEFAULT_RPC_ERROR } from "lib/data";
 import { useInstantiatedByMe } from "lib/model/contract";
 import { useContractStore } from "lib/providers/store";
-import { queryContract } from "lib/services/contract";
+import { queryContract } from "lib/services/wasm/contract";
 import type { BechAddr32, RpcQueryError } from "lib/types";
 
 import { AllContractLists } from "./AllContractLists";

src/lib/model/contract.ts

@@ -4,7 +4,7 @@ import { useContractStore } from "lib/providers/store";
 import {
   useInstantiatedCountByUserQuery,
   useInstantiatedListByUserQuery,
-} from "lib/services/contractService";
+} from "lib/services/wasm/contract";
 import type { ContractListInfo } from "lib/stores/contract";
 import type { BechAddr, BechAddr32 } from "lib/types";
 import { formatSlugName, getCurrentDate, getDefaultDate } from "lib/utils";

src/lib/pages/account-details/data.ts

@@ -1,11 +1,11 @@
 import { useCodeStore, useContractStore } from "lib/providers/store";
 import { useAccountTableCounts } from "lib/services/accountService";
 import { useBalances } from "lib/services/bank";
+import { useCodesByAddress } from "lib/services/wasm/code";
 import {
   useAdminContractsByAddress,
   useInstantiatedContractsByAddress,
-} from "lib/services/contractService";
-import { useCodesByAddress } from "lib/services/wasm/code";
+} from "lib/services/wasm/contract";
 import type {
   BechAddr,
   CodeInfo,

src/lib/pages/admin/index.tsx

@@ -23,7 +23,7 @@ import { TextInput } from "lib/components/forms";
 import { UserDocsLink } from "lib/components/UserDocsLink";
 import WasmPageContainer from "lib/components/WasmPageContainer";
 import { useTxBroadcast } from "lib/hooks";
-import { useContractDetailByContractAddress } from "lib/services/contractService";
+import { useContractDetailByContractAddress } from "lib/services/wasm/contract";
 import type { BechAddr, BechAddr32 } from "lib/types";
 import { MsgType } from "lib/types";
 import { composeMsg, getFirstQueryParam } from "lib/utils";

src/lib/pages/code-details/data.ts

@@ -1,8 +1,8 @@
 import type { UseQueryOptions } from "@tanstack/react-query";
 
 import { useContractStore } from "lib/providers/store";
-import type { ContractsResponse } from "lib/services/contract";
-import { useContractsByCodeId } from "lib/services/contractService";
+import type { ContractsResponse } from "lib/services/types";
+import { useContractsByCodeId } from "lib/services/wasm/contract";
 import type { ContractInfo, Option } from "lib/types";
 
 export const useCodeContracts = (

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

@@ -21,7 +21,7 @@ import {
 import { Tooltip } from "lib/components/Tooltip";
 import { useExecuteCmds } from "lib/hooks";
 import { useSchemaStore } from "lib/providers/store";
-import { useContractQueryMsgs } from "lib/services/contractService";
+import { useContractQueryMsgs } from "lib/services/wasm/contract";
 import type { BechAddr32 } from "lib/types";
 import { encode, jsonPrettify } from "lib/utils";
 

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

@@ -20,7 +20,7 @@ import {
   SaveContractDetailsModal,
 } from "lib/components/modal";
 import { TotalValue } from "lib/components/TotalValue";
-import type { Contract } from "lib/services/contract";
+import type { Contract } from "lib/services/types";
 import type { ContractLocalInfo } from "lib/stores/contract";
 import { ContractInteractionTabs } from "lib/types";
 import type {

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

@@ -4,7 +4,7 @@ import { useCurrentChain, useGetAddressType } from "lib/app-provider";
 import { Copier } from "lib/components/copy";
 import { ExplorerLink } from "lib/components/ExplorerLink";
 import { LabelText } from "lib/components/LabelText";
-import type { Contract, ContractRest } from "lib/services/contract";
+import type { Contract, ContractRest } from "lib/services/types";
 import type { CodeLocalInfo } from "lib/stores/code";
 import type { Nullable, Option } from "lib/types";
 import { dateFromNow, formatUTC, getCw2Info } from "lib/utils";

src/lib/pages/contract-details/components/contract-description/UserContractDesc.tsx

@@ -6,7 +6,7 @@ import { useClampText } from "use-clamp-text";
 import { ShowMoreButton } from "lib/components/button";
 import { CustomIcon } from "lib/components/icon";
 import { EditContractDetailsModal } from "lib/components/modal";
-import type { Contract } from "lib/services/contract";
+import type { Contract } from "lib/services/types";
 import type { ContractLocalInfo } from "lib/stores/contract";
 import type { Nullable, Option, PublicContractInfo } from "lib/types";
 

src/lib/pages/contract-details/components/contract-description/index.tsx

@@ -3,7 +3,7 @@ import { Flex } from "@chakra-ui/react";
 import { useMobile } from "lib/app-provider";
 import { CustomIcon } from "lib/components/icon";
 import { PublicDescription } from "lib/components/PublicDescription";
-import type { Contract } from "lib/services/contract";
+import type { Contract } from "lib/services/types";
 import type { ContractLocalInfo } from "lib/stores/contract";
 import type { Nullable, Option, PublicContractInfo } from "lib/types";
 

src/lib/pages/contract-details/components/tables/index.tsx

@@ -9,7 +9,7 @@ import {
 
 import { useGovConfig } from "lib/app-provider";
 import { CustomTab } from "lib/components/CustomTab";
-import { useContractTableCounts } from "lib/services/contractService";
+import { useContractTableCounts } from "lib/services/wasm/contract";
 import type { BechAddr32 } from "lib/types";
 
 import { MigrationTable } from "./migration";

src/lib/pages/contract-details/data.ts

@@ -2,7 +2,7 @@ import { useCodeStore, useContractStore } from "lib/providers/store";
 import {
   useContractDataByContractAddress,
   useMigrationHistoriesByContractAddress,
-} from "lib/services/contractService";
+} from "lib/services/wasm/contract";
 import type { BechAddr32, ContractMigrationHistory } from "lib/types";
 
 export const useContractData = (contractAddress: BechAddr32) => {

src/lib/pages/contracts/data.ts

@@ -1,5 +1,5 @@
 import { useContractStore } from "lib/providers/store";
-import { useContracts } from "lib/services/contractService";
+import { useContracts } from "lib/services/wasm/contract";
 import type { ContractInfo } from "lib/types";
 
 export const useRecentContracts = (

src/lib/pages/interact-contract/components/query-area/JsonQuery.tsx

@@ -18,8 +18,7 @@ import JsonReadOnly from "lib/components/json/JsonReadOnly";
 import { LoadingOverlay } from "lib/components/LoadingOverlay";
 import { DEFAULT_RPC_ERROR } from "lib/data";
 import { useContractStore } from "lib/providers/store";
-import { queryData } from "lib/services/contract";
-import { useContractQueryMsgs } from "lib/services/contractService";
+import { queryData, useContractQueryMsgs } from "lib/services/wasm/contract";
 import type { BechAddr32, RpcQueryError } from "lib/types";
 import {
   encode,

src/lib/pages/interact-contract/components/query-area/schema-query/SchemaQueryComponent.tsx

@@ -27,7 +27,7 @@ import {
   OutputMessageTabs,
 } from "lib/components/json-schema";
 import { DEFAULT_RPC_ERROR } from "lib/data";
-import { queryData } from "lib/services/contract";
+import { queryData } from "lib/services/wasm/contract";
 import type { Activity } from "lib/stores/contract";
 import type { SchemaInfo } from "lib/stores/schema";
 import type {

src/lib/pages/interact-contract/index.tsx

@@ -12,7 +12,7 @@ import { ContractSelectSection } from "lib/components/ContractSelectSection";
 import PageContainer from "lib/components/PageContainer";
 import { InvalidState } from "lib/components/state";
 import { UserDocsLink } from "lib/components/UserDocsLink";
-import type { ContractDetail } from "lib/services/contractService";
+import type { ContractDetail } from "lib/services/types";
 import { ContractInteractionTabs } from "lib/types";
 import type { BechAddr32, Coin } from "lib/types";
 import { jsonPrettify, jsonValidate, libDecode } from "lib/utils";

src/lib/pages/migrate/index.tsx

@@ -17,8 +17,8 @@ import { Loading } from "lib/components/Loading";
 import { Stepper } from "lib/components/stepper";
 import WasmPageContainer from "lib/components/WasmPageContainer";
 import { useUploadCode } from "lib/hooks";
-import { useContractDetailByContractAddress } from "lib/services/contractService";
 import { useUploadAccessParams } from "lib/services/proposalService";
+import { useContractDetailByContractAddress } from "lib/services/wasm/contract";
 import type { BechAddr32 } from "lib/types";
 import { getFirstQueryParam } from "lib/utils";
 

src/lib/services/nameService.ts

@@ -13,9 +13,9 @@ import {
 } from "lib/app-provider";
 import type { BechAddr, BechAddr32, Option } from "lib/types";
 
-import { queryContract } from "./contract";
 import type { ICNSNamesResponse } from "./ns";
 import { queryAddressByICNSName, queryICNSNamesByAddress } from "./ns";
+import { queryContract } from "./wasm/contract";
 
 export const useICNSNamesByAddress = (
   address: Option<BechAddr>

src/lib/services/searchService.ts

@@ -20,7 +20,6 @@ import {
 } from "lib/utils";
 
 import { useBlockData } from "./block";
-import { queryContract } from "./contract";
 import { useModuleByAddressLcd } from "./move/moduleService";
 import { useAddressByICNSName, useICNSNamesByAddress } from "./nameService";
 import type { ICNSNamesResponse } from "./ns";
@@ -29,6 +28,7 @@ import { useProposalData } from "./proposalService";
 import { useTxData } from "./tx";
 import { useValidatorData } from "./validator";
 import { useCodeDataByCodeId } from "./wasm/code";
+import { queryContract } from "./wasm/contract";
 
 export type SearchResultType =
   | "Code ID"