fixed some path issue of new interchianjs in the chain-admin

sdqede · sdqede · commit c54800844be6 · 2025-07-02T23:53:16.000+12:00
diff --git a/templates/chain-admin/hooks/contract/useCodeDetails.ts b/templates/chain-admin/hooks/contract/useCodeDetails.ts
@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { createGetCode } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
+import { getCode } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
 
 import { prettyCodeInfo } from '@/utils';
 import { useChainStore } from '@/contexts';
@@ -12,12 +12,11 @@ export const useCodeDetails = (codeId: number, enabled: boolean = true) => {
   return useQuery({
     queryKey: ['useCodeDetails', codeId],
     queryFn: async () => {
-      const getCode = createGetCode(rpcEndpoint);
       try {
-        const { codeInfo } = await getCode({
+        const response = await getCode(rpcEndpoint!, {
           codeId: BigInt(codeId),
         });
-        return codeInfo && prettyCodeInfo(codeInfo);
+        return response.codeInfo && prettyCodeInfo(response.codeInfo);
       } catch (error) {
         console.error(error);
         return null;
diff --git a/templates/chain-admin/hooks/contract/useExecuteContractTx.tsx b/templates/chain-admin/hooks/contract/useExecuteContractTx.tsx
@@ -1,6 +1,6 @@
 import { useChain } from '@interchain-kit/react';
 import { getSigningJsdClient, jsd } from 'hyperwebjs';
-import { createExecuteContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.func';
+import { executeContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.func';
 import { StdFee } from '@interchainjs/react/types';
 import { Coin } from '@interchainjs/react/cosmos/base/v1beta1/coin';
 
@@ -45,8 +45,12 @@ export const useExecuteContractTx = (chainName: string) => {
   }: ExecuteTxParams) => {
     await handleTx({
       txFunction: async () => {
-        const executeContract = createExecuteContract(signingClient as any);
+        if (!signingClient) {
+          throw new Error('Signing client is not available');
+        }
+
         const res = await executeContract(
+          signingClient,
           address,
           {
             sender: address,
@@ -83,8 +87,12 @@ export const useExecuteContractTx = (chainName: string) => {
 
     await handleTx({
       txFunction: async () => {
+        if (!rpcEndpoint) {
+          throw new Error('RPC endpoint is not available');
+        }
+
         const signingClient = await getSigningJsdClient({
-          rpcEndpoint: rpcEndpoint!,
+          rpcEndpoint,
           signer: wallet.getOfflineSigner(chain.chainId ?? '') as any,
         });
 
diff --git a/templates/chain-admin/hooks/contract/useInstantiateTx.tsx b/templates/chain-admin/hooks/contract/useInstantiateTx.tsx
@@ -1,5 +1,6 @@
-import { DeliverTxResponse, getSigningJsdClient, jsd } from 'hyperwebjs';
-import { createInstantiateContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.func';
+import { getSigningJsdClient, jsd } from 'hyperwebjs';
+import { instantiateContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.func';
+import { DeliverTxResponse } from '@interchainjs/react/types';
 import { StdFee } from '@interchainjs/react/types';
 import { Coin } from '@interchainjs/react/cosmos/base/v1beta1/coin';
 import { useChain } from '@interchain-kit/react';
@@ -47,8 +48,12 @@ export const useInstantiateTx = (chainName: string) => {
 
     await handleTx<DeliverTxResponse>({
       txFunction: async () => {
-        const instantiateContract = createInstantiateContract(signingClient);
+        if (!signingClient) {
+          throw new Error('Signing client is not available');
+        }
+
         const res = await instantiateContract(
+          signingClient,
           address,
           {
             sender: address,
@@ -79,8 +84,12 @@ export const useInstantiateTx = (chainName: string) => {
 
     await handleTx<DeliverTxResponse>({
       txFunction: async () => {
+        if (!rpcEndpoint) {
+          throw new Error('RPC endpoint is not available');
+        }
+
         const signingClient = await getSigningJsdClient({
-          rpcEndpoint: rpcEndpoint!,
+          rpcEndpoint,
           signer: wallet.getOfflineSigner(chain.chainId ?? '') as any,
         });
 
diff --git a/templates/chain-admin/hooks/contract/useMyContracts.ts b/templates/chain-admin/hooks/contract/useMyContracts.ts
@@ -1,15 +1,15 @@
 import { useChain } from '@interchain-kit/react';
 import { useQuery } from '@tanstack/react-query';
 import {
-  createGetContractsByCreator,
-  createGetContractInfo,
+  getContractsByCreator,
+  getContractInfo,
 } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
-import { RpcResolver } from '@interchainjs/react/helper-func-types';
 
 import { useChainStore } from '@/contexts';
 
 import { useIsHyperwebChain, useRpcEndpoint } from '../common';
 import { JsdQueryClient, useJsdQueryClient } from './useJsdQueryClient';
+import { HttpEndpoint } from '@interchainjs/types';
 
 export type WasmContractInfo = Awaited<
   ReturnType<typeof fetchWasmContracts>
@@ -56,12 +56,12 @@ export const useMyContracts = () => {
   });
 };
 
-const fetchWasmContracts = async (client: RpcResolver, address: string) => {
-  const getContractsByCreator = createGetContractsByCreator(client);
-  const getContractInfo = createGetContractInfo(client);
-
+const fetchWasmContracts = async (
+  client: string | HttpEndpoint,
+  address: string
+) => {
   try {
-    const { contractAddresses } = await getContractsByCreator({
+    const { contractAddresses } = await getContractsByCreator(client, {
       creatorAddress: address,
       pagination: {
         limit: 1000n,
@@ -73,7 +73,9 @@ const fetchWasmContracts = async (client: RpcResolver, address: string) => {
     });
 
     const contracts = await Promise.all(
-      contractAddresses.map((address) => getContractInfo({ address }))
+      contractAddresses.map((contractAddress: string) =>
+        getContractInfo(client, { address: contractAddress })
+      )
     );
 
     return contracts;
diff --git a/templates/chain-admin/hooks/contract/useQueryContract.ts b/templates/chain-admin/hooks/contract/useQueryContract.ts
@@ -1,5 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
-import { createGetSmartContractState } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
+import { getSmartContractState } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
 
 import { useChainStore } from '@/contexts';
 import { fromUint8Array, toUint8Array } from '@/utils';
@@ -20,10 +20,13 @@ export const useQueryContract = ({
 
   return useQuery({
     queryKey: ['useQueryContract', contractAddress, queryMsg],
-    queryFn: () => {
+    queryFn: async () => {
+      if (!rpcEndpoint) {
+        throw new Error('RPC endpoint is not available');
+      }
+
       const parsedQueryMsg = queryMsg ? JSON.parse(queryMsg) : null;
-      const getSmartContractState = createGetSmartContractState(rpcEndpoint);
-      return getSmartContractState({
+      return getSmartContractState(rpcEndpoint, {
         address: contractAddress,
         queryData: parsedQueryMsg
           ? toUint8Array(parsedQueryMsg)
diff --git a/templates/chain-admin/hooks/voting/useVotingData.ts b/templates/chain-admin/hooks/voting/useVotingData.ts
@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { useChain } from '@interchain-kit/react';
 import { defaultContext, useQueries } from '@tanstack/react-query';
 import { ProposalStatus } from '@interchainjs/react/cosmos/gov/v1beta1/gov';
-import { createGetVote } from '@interchainjs/react/cosmos/gov/v1beta1/query.rpc.func';
+import { getVote } from '@interchainjs/react/cosmos/gov/v1beta1/query.rpc.func';
 import { Proposal as ProposalV1 } from '@interchainjs/react/cosmos/gov/v1/gov';
 import { chains } from 'chain-registry';
 import {
@@ -50,7 +50,6 @@ export function useVotingData(chainName: string) {
   const { address } = useChain(chainName);
   const { data: rpcEndpoint, isFetching } = useRpcEndpoint(chainName);
 
-  const getVote = createGetVote(rpcEndpoint);
   const chain = chains.find((c) => c.chainName === chainName);
   const isReady = !!address && !!rpcEndpoint;
 
@@ -111,11 +110,15 @@ export function useVotingData(chainName: string) {
   const votesQueries = useQueries({
     queries: (votedProposalsQuery.data || []).map(({ id }) => ({
       queryKey: ['voteQuery', id, address],
-      queryFn: () =>
-        getVote({
+      queryFn: async () => {
+        if (!rpcEndpoint) {
+          throw new Error('RPC endpoint is not available');
+        }
+        return getVote(rpcEndpoint, {
           proposalId: id,
           voter: address || '',
-        }),
+        });
+      },
       enabled: isReady && !!votedProposalsQuery.data,
       keepPreviousData: true,
     })),
