Skip to content

Fixed issue caused by interchainjs update #51

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 24, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions templates/chain-template/components/contract/common/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ export * from './JsonInput';
export * from './ComboboxField';
export * from './ContractAddressField';
export * from './AttachFundsRadio';
export * from './SelectAssetContent';
export * from './SelectAssetItem';
export * from './BackButton';
38 changes: 18 additions & 20 deletions templates/chain-template/hooks/contract/useCodeDetails.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useQuery } from '@tanstack/react-query';
import { createGetCode } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
import { useGetCode } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.react';
import { defaultContext } from '@tanstack/react-query';

import { prettyCodeInfo } from '@/utils';
import { useChainStore } from '@/contexts';
Expand All @@ -9,25 +10,22 @@ export const useCodeDetails = (codeId: number, enabled: boolean = true) => {
const { selectedChain } = useChainStore();
const { data: rpcEndpoint } = useRpcEndpoint(selectedChain);

return useQuery({
queryKey: ['useCodeDetails', codeId],
queryFn: async () => {
const getCode = createGetCode(rpcEndpoint);
try {
const { codeInfo } = await getCode({
codeId: BigInt(codeId),
});
return codeInfo && prettyCodeInfo(codeInfo);
} catch (error) {
console.error(error);
return null;
}
const { data, refetch } = useGetCode({
request: {
codeId: BigInt(codeId),
},
enabled: !!rpcEndpoint && enabled,
retry: false,
cacheTime: 0,
refetchOnMount: false,
refetchOnReconnect: false,
refetchOnWindowFocus: false,
options: {
enabled: !!rpcEndpoint && enabled,
retry: false,
cacheTime: 0,
refetchOnMount: false,
refetchOnReconnect: false,
refetchOnWindowFocus: false,
select: ({ codeInfo }) => codeInfo && prettyCodeInfo(codeInfo),
context: defaultContext,
},
clientResolver: rpcEndpoint,
});

return { data, refetch };
};
65 changes: 40 additions & 25 deletions templates/chain-template/hooks/contract/useExecuteContractTx.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { createExecuteContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.func';
import { useChain } from '@interchain-kit/react';
import { useExecuteContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.react';
import { MsgExecuteContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx';
import { Coin, StdFee } from '@interchainjs/react/types';
import { defaultContext } from '@tanstack/react-query';

import { toUint8Array } from '@/utils';

import { useHandleTx } from './useHandleTx';
import { useCustomSigningClient } from '../common';

interface ExecuteTxParams {
Expand All @@ -17,38 +18,52 @@ interface ExecuteTxParams {
}

export const useExecuteContractTx = (chainName: string) => {
const { address } = useChain(chainName);
const { data: signingClient } = useCustomSigningClient();
const handleTx = useHandleTx(chainName);
const { mutate: executeContract, isLoading } = useExecuteContract({
clientResolver: signingClient,
options: {
context: defaultContext,
},
});

const executeTx = async ({
address,
contractAddress,
fee,
funds,
msg,
onTxFailed = () => {},
onTxSucceed = () => {},
onTxFailed = () => { },
onTxSucceed = () => { },
}: ExecuteTxParams) => {
await handleTx({
txFunction: async () => {
const executeContract = createExecuteContract(signingClient);
const res = await executeContract(
address,
{
sender: address,
contract: contractAddress,
msg: toUint8Array(msg),
funds,
},
fee,
'',
);
return res;
},
onTxSucceed,
onTxFailed,
const message = MsgExecuteContract.fromPartial({
sender: address,
contract: contractAddress,
msg: toUint8Array(msg),
funds,
});

executeContract(
{
signerAddress: address,
message,
fee,
memo: 'Execute Contract',
},
{
onSuccess: (res) => {
if (res.code !== 0) {
throw new Error(res.rawLog || 'Failed to execute contract');
}
onTxSucceed();
},
onError: (error) => {
console.error('Failed to execute contract:', error);
onTxFailed();
},
}
);
};

return { executeTx };
return { executeTx, isLoading };
};
70 changes: 42 additions & 28 deletions templates/chain-template/hooks/contract/useInstantiateTx.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { createInstantiateContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.func';
import { useChain } from '@interchain-kit/react';
import { useInstantiateContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx.rpc.react';
import { MsgInstantiateContract } from '@interchainjs/react/cosmwasm/wasm/v1/tx';
import { Coin, DeliverTxResponse, StdFee } from '@interchainjs/react/types';
import { defaultContext } from '@tanstack/react-query';

import { toUint8Array } from '@/utils';

import { useHandleTx } from './useHandleTx';
import { useCustomSigningClient } from '../common';

interface InstantiateTxParams {
Expand All @@ -18,8 +19,14 @@ interface InstantiateTxParams {
}

export const useInstantiateTx = (chainName: string) => {
const { address } = useChain(chainName);
const { data: signingClient } = useCustomSigningClient();
const handleTx = useHandleTx(chainName);
const { mutate: instantiateContract, isLoading } = useInstantiateContract({
clientResolver: signingClient,
options: {
context: defaultContext,
},
});

const instantiateTx = async ({
address,
Expand All @@ -28,34 +35,41 @@ export const useInstantiateTx = (chainName: string) => {
label,
admin,
funds,
onTxSucceed,
onTxFailed,
onTxSucceed = () => { },
onTxFailed = () => { },
}: InstantiateTxParams) => {
const fee: StdFee = { amount: [], gas: '300000' };

await handleTx<DeliverTxResponse>({
txFunction: async () => {
const instantiateContract = createInstantiateContract(signingClient);
const res = await instantiateContract(
address,
{
sender: address,
codeId: BigInt(codeId),
admin,
funds,
label,
msg: toUint8Array(initMsg),
},
fee,
'',
);
return res;
},
successMessage: 'Instantiate Success',
onTxSucceed,
onTxFailed,
const message = MsgInstantiateContract.fromPartial({
sender: address,
codeId: BigInt(codeId),
admin,
funds,
label,
msg: toUint8Array(initMsg),
});

instantiateContract(
{
signerAddress: address,
message,
fee,
memo: 'Instantiate Contract',
},
{
onSuccess: (res) => {
if (res.code !== 0) {
throw new Error(res.rawLog || 'Failed to instantiate contract');
}
onTxSucceed(res);
},
onError: (error) => {
console.error('Failed to instantiate contract:', error);
onTxFailed();
},
}
);
};

return { instantiateTx };
return { instantiateTx, isLoading };
};
89 changes: 42 additions & 47 deletions templates/chain-template/hooks/contract/useMyContracts.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,25 @@
import { useChain } from '@interchain-kit/react';
import { useQuery } from '@tanstack/react-query';
import {
createGetContractsByCreator,
createGetContractInfo,
} from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
import { RpcResolver } from '@interchainjs/react/helper-func-types';
import { useGetContractsByCreator } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.react';
import { defaultContext } from '@tanstack/react-query';

import { useChainStore } from '@/contexts';

import { useRpcEndpoint } from '../common';

export type WasmContractInfo = Awaited<
ReturnType<typeof fetchWasmContracts>
>[number];
export type WasmContractInfo = {
address: string;
contractInfo: {
label: string;
codeId: bigint;
admin: string;
creator: string;
created?: {
blockHeight: bigint;
txIndex: bigint;
};
ibc_port_id?: string;
extension?: any;
};
};

type Contracts = {
wasmContracts: WasmContractInfo[];
Expand All @@ -23,49 +30,37 @@ export const useMyContracts = () => {
const { address } = useChain(selectedChain);
const { data: rpcEndpoint } = useRpcEndpoint(selectedChain);

return useQuery<Contracts>({
queryKey: ['myContracts', selectedChain, address],
queryFn: async () => {
const contracts: Contracts = {
wasmContracts: [],
};

if (address && rpcEndpoint) {
contracts.wasmContracts = await fetchWasmContracts(
rpcEndpoint,
address,
);
}

return contracts;
},
enabled: !!address && !!rpcEndpoint,
});
};

const fetchWasmContracts = async (client: RpcResolver, address: string) => {
const getContractsByCreator = createGetContractsByCreator(client);
const getContractInfo = createGetContractInfo(client);

try {
const { contractAddresses } = await getContractsByCreator({
creatorAddress: address,
const { data, isLoading } = useGetContractsByCreator({
request: {
creatorAddress: address || '',
pagination: {
limit: 1000n,
reverse: true,
countTotal: false,
key: new Uint8Array(),
offset: 0n,
},
});

const contracts = await Promise.all(
contractAddresses.map((address) => getContractInfo({ address })),
);
},
options: {
enabled: !!address && !!rpcEndpoint,
select: ({ contractAddresses }) => {
const contracts: Contracts = {
wasmContracts: contractAddresses.map((address) => ({
address,
contractInfo: {
label: 'Contract', // Placeholder - full implementation would fetch this
codeId: 0n,
admin: '',
creator: '',
},
})),
};
return contracts;
},
context: defaultContext,
},
clientResolver: rpcEndpoint,
});

return contracts;
} catch (error) {
console.error('Error fetching WASM contracts:', error);
return [];
}
return { data, isLoading };
};
29 changes: 14 additions & 15 deletions templates/chain-template/hooks/contract/useQueryContract.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { useQuery } from '@tanstack/react-query';
import { createGetSmartContractState } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.func';
import { useGetSmartContractState } from '@interchainjs/react/cosmwasm/wasm/v1/query.rpc.react';
import { defaultContext } from '@tanstack/react-query';

import { useChainStore } from '@/contexts';
import { fromUint8Array, toUint8Array } from '@/utils';

import { useRpcEndpoint } from '../common';

export const useQueryContract = ({
Expand All @@ -18,19 +18,18 @@ export const useQueryContract = ({
const { selectedChain } = useChainStore();
const { data: rpcEndpoint } = useRpcEndpoint(selectedChain);

return useQuery({
queryKey: ['useQueryContract', contractAddress, queryMsg],
queryFn: () => {
const parsedQueryMsg = queryMsg ? JSON.parse(queryMsg) : null;
const getSmartContractState = createGetSmartContractState(rpcEndpoint);
return getSmartContractState({
address: contractAddress,
queryData: parsedQueryMsg
? toUint8Array(parsedQueryMsg)
: new Uint8Array(),
});
const { data, refetch, error, isFetching } = useGetSmartContractState({
request: {
address: contractAddress,
queryData: queryMsg ? toUint8Array(JSON.parse(queryMsg)) : new Uint8Array(),
},
options: {
enabled: !!rpcEndpoint && !!contractAddress && !!queryMsg && enabled,
select: ({ data }) => fromUint8Array(data),
context: defaultContext,
},
select: ({ data }) => fromUint8Array(data),
enabled: !!rpcEndpoint && !!contractAddress && !!queryMsg && enabled,
clientResolver: rpcEndpoint,
});

return { data, refetch, error, isFetching };
};
Loading