remove interchain query and upgrade interchainjs

Zetazzz · Zetazzz · commit 3fc76b561329 · 2025-01-27T10:04:42.000+08:00
diff --git a/examples/authz/components/authz/GrantCard.tsx b/examples/authz/components/authz/GrantCard.tsx
@@ -29,7 +29,7 @@ import {
 import { getCoin, permissionNameToRouteMap } from '@/configs';
 
 import styles from '@/styles/custom.module.css';
-import { useRevoke } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { useRevoke } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
 
 type GrantCardProps = {
diff --git a/examples/authz/components/authz/GrantDetailsModal.tsx b/examples/authz/components/authz/GrantDetailsModal.tsx
@@ -12,7 +12,7 @@ import {
 } from '@/hooks';
 import { PrettyGrant, PrettyPermission } from '@/utils';
 import { PermissionDetailCard } from './PermissionDetailCard';
-import { useRevoke } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { useRevoke } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
 import { useChain } from '@cosmos-kit/react';
 
diff --git a/examples/authz/components/authz/GrantModal.tsx b/examples/authz/components/authz/GrantModal.tsx
@@ -28,7 +28,7 @@ import {
   PermissionItem,
   permissions,
 } from '@/configs';
-import { AuthorizationType } from 'interchain-react/cosmos/staking/v1beta1/authz';
+import { AuthorizationType } from '@interchainjs/react/cosmos/staking/v1beta1/authz';
 import {
   GrantMsg,
   useAuthzTx,
@@ -41,9 +41,9 @@ import { CustomizationField } from './CustomizationField';
 import { AddressInput } from '@/components';
 
 import styles from '@/styles/custom.module.css';
-import { useGrant } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { useGrant } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
-import { SendAuthorization } from 'interchain-react/cosmos/bank/v1beta1/authz';
+import { SendAuthorization } from '@interchainjs/react/cosmos/bank/v1beta1/authz';
 
 export type AccessList = {
   type: 'allowList' | 'denyList';
diff --git a/examples/authz/components/claim-rewards/Overview.tsx b/examples/authz/components/claim-rewards/Overview.tsx
@@ -17,9 +17,9 @@ import {
   isGreaterThanZero,
   type ParsedRewards as Rewards,
 } from '@/utils';
-import { MsgWithdrawDelegatorReward } from 'interchain-react/cosmos/distribution/v1beta1/tx';
+import { MsgWithdrawDelegatorReward } from '@interchainjs/react/cosmos/distribution/v1beta1/tx';
 import { useAuthzContext } from '@/context';
-import { useExec } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { useExec } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
 
 const Overview = ({
diff --git a/examples/authz/components/send/send.tsx b/examples/authz/components/send/send.tsx
@@ -20,9 +20,9 @@ import {
 } from '@/utils';
 import { useAuthzContext } from '@/context';
 import { AddressInput } from '@/components';
-import { MsgSend } from 'interchain-react/cosmos/bank/v1beta1/tx';
-import { SendAuthorization } from 'interchain-react/cosmos/bank/v1beta1/authz';
-import { useExec } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { MsgSend } from '@interchainjs/react/cosmos/bank/v1beta1/tx';
+import { SendAuthorization } from '@interchainjs/react/cosmos/bank/v1beta1/authz';
+import { useExec } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
 
 type SendSectionProps = {
diff --git a/examples/authz/components/staking/DelegateModal.tsx b/examples/authz/components/staking/DelegateModal.tsx
@@ -31,9 +31,9 @@ import {
   useSigningClientDirect,
   useToast,
 } from '@/hooks';
-import { MsgDelegate } from 'interchain-react/cosmos/staking/v1beta1/tx';
-import { StakeAuthorization } from 'interchain-react/cosmos/staking/v1beta1/authz';
-import { useExec } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { MsgDelegate } from '@interchainjs/react/cosmos/staking/v1beta1/tx';
+import { StakeAuthorization } from '@interchainjs/react/cosmos/staking/v1beta1/authz';
+import { useExec } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
 
 export const DelegateModal = ({
diff --git a/examples/authz/components/staking/Overview.tsx b/examples/authz/components/staking/Overview.tsx
@@ -9,8 +9,7 @@ import {
 } from '@interchain-ui/react';
 import { useChain } from '@cosmos-kit/react';
 import { ChainName } from 'cosmos-kit';
-import { cosmos } from 'interchain-query';
-import { useWithdrawDelegatorReward } from 'interchain-react/cosmos/distribution/v1beta1/tx.rpc.func';
+import { useWithdrawDelegatorReward } from '@interchainjs/react/cosmos/distribution/v1beta1/tx.rpc.react';
 
 import { getCoin } from '@/configs';
 import { Prices, useSigningClientDirect, useTx } from '@/hooks';
@@ -21,7 +20,7 @@ import {
   type ParsedRewards as Rewards,
 } from '@/utils';
 import { defaultContext } from '@tanstack/react-query';
-import { MsgWithdrawDelegatorReward } from 'interchain-react/cosmos/distribution/v1beta1/tx';
+import { MsgWithdrawDelegatorReward } from '@interchainjs/react/cosmos/distribution/v1beta1/tx';
 
 const Overview = ({
   balance,
diff --git a/examples/authz/components/voting/Proposal.tsx b/examples/authz/components/voting/Proposal.tsx
@@ -15,7 +15,7 @@ import {
 import {
   Proposal as IProposal,
   ProposalStatus,
-} from 'interchain-query/cosmos/gov/v1beta1/gov';
+} from '@interchainjs/react/cosmos/gov/v1beta1/gov';
 import {
   exponentiate,
   formatDate,
@@ -27,8 +27,8 @@ import Markdown from 'react-markdown';
 import { useEffect, useState } from 'react';
 import { useAuthzTx, useSigningClientDirect, Votes } from '@/hooks';
 import { useAuthzContext } from '@/context';
-import { MsgVote } from 'interchain-react/cosmos/gov/v1beta1/tx';
-import { useExec } from 'interchain-react/cosmos/authz/v1beta1/tx.rpc.func';
+import { MsgVote } from '@interchainjs/react/cosmos/gov/v1beta1/tx';
+import { useExec } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 
 // export declare enum VoteOption {
 //   /** VOTE_OPTION_UNSPECIFIED - VOTE_OPTION_UNSPECIFIED defines a no-op vote option. */
diff --git a/examples/authz/components/voting/Voting.tsx b/examples/authz/components/voting/Voting.tsx
@@ -8,7 +8,7 @@ import {
   ProposalStatus,
   TallyResult,
   TextProposal,
-} from 'interchain-query/cosmos/gov/v1beta1/gov';
+} from '@interchainjs/react/cosmos/gov/v1beta1/gov';
 import {
   BasicModal,
   Box,
diff --git a/examples/authz/hooks/useAuthzTx.ts b/examples/authz/hooks/useAuthzTx.ts
@@ -1,27 +1,27 @@
 import { useChain } from '@cosmos-kit/react';
 import { isDeliverTxSuccess, StdFee } from '@cosmjs/stargate';
 
-import { MsgVote } from 'interchain-react/cosmos/gov/v1beta1/tx';
-import { MsgWithdrawDelegatorReward } from 'interchain-react/cosmos/distribution/v1beta1/tx';
-import { MsgExec, MsgGrant } from 'interchain-react/cosmos/authz/v1beta1/tx';
-import { EncodeObject } from 'interchain-react/types';
-import { SendAuthorization } from 'interchain-react/cosmos/bank/v1beta1/authz';
+import { MsgVote } from '@interchainjs/react/cosmos/gov/v1beta1/tx';
+import { MsgWithdrawDelegatorReward } from '@interchainjs/react/cosmos/distribution/v1beta1/tx';
+import { MsgExec, MsgGrant } from '@interchainjs/react/cosmos/authz/v1beta1/tx';
+import { EncodeObject } from '@interchainjs/react/types';
+import { SendAuthorization } from '@interchainjs/react/cosmos/bank/v1beta1/authz';
 import {
   AuthorizationType,
   StakeAuthorization,
-} from 'interchain-react/cosmos/staking/v1beta1/authz';
-import { GenericAuthorization } from 'interchain-react/cosmos/authz/v1beta1/authz';
+} from '@interchainjs/react/cosmos/staking/v1beta1/authz';
+import { GenericAuthorization } from '@interchainjs/react/cosmos/authz/v1beta1/authz';
 
 import { getTokenByChainName, PrettyPermission } from '@/utils';
 import { Permission } from '@/configs';
 import { useToast, type CustomToast } from './useToast';
 import { coin } from '@cosmjs/amino';
-import { MsgSend } from 'interchain-react/cosmos/bank/v1beta1/tx';
+import { MsgSend } from '@interchainjs/react/cosmos/bank/v1beta1/tx';
 import {
   MsgDelegate,
   MsgBeginRedelegate,
   MsgUndelegate,
-} from 'interchain-react/cosmos/staking/v1beta1/tx';
+} from '@interchainjs/react/cosmos/staking/v1beta1/tx';
 import dayjs from 'dayjs';
 
 // ==========================================
diff --git a/examples/authz/hooks/useGrants.ts b/examples/authz/hooks/useGrants.ts
@@ -7,14 +7,16 @@ import { useQueryHooks } from './useQueryHooks';
 import {
   useGetGranteeGrants,
   useGetGranterGrants,
-} from 'interchain-react/cosmos/authz/v1beta1/query.rpc.func';
+} from '@interchainjs/react/cosmos/authz/v1beta1/query.rpc.react';
 
 export const useGrants = (chainName: string) => {
   const { address } = useChain(chainName);
   const prevAddressRef = useRef(address);
 
   const { rpcEndpoint, isFetching: isRpcQueryClientLoading } =
-    useQueryHooks(chainName);
+    useQueryHooks(chainName, {
+      context: defaultContext,
+    });
 
   const granterGrantsQuery = useGetGranterGrants({
     request: {
diff --git a/examples/authz/hooks/useQueryHooks.ts b/examples/authz/hooks/useQueryHooks.ts
@@ -1,11 +1,13 @@
 import { useChain } from '@cosmos-kit/react';
 import {
   useRpcEndpoint,
-  useRpcClient,
-  createRpcQueryHooks,
-} from 'interchain-query';
-
-export const useQueryHooks = (chainName: string) => {
+} from '@interchainjs/react/react-query';
+import { UseQueryOptions } from '@tanstack/react-query';
+import { HttpEndpoint } from '@interchainjs/types';
+export const useQueryHooks = (
+  chainName: string,
+  options?: UseQueryOptions<string | HttpEndpoint, Error>
+) => {
   const { getRpcEndpoint } = useChain(chainName);
 
   const rpcEndpointQuery = useRpcEndpoint({
@@ -15,19 +17,12 @@ export const useQueryHooks = (chainName: string) => {
       queryKeyHashFn: (queryKey) => {
         return JSON.stringify([...queryKey, chainName]);
       },
+      ...options,
     },
   });
 
-  const rpcClientQuery = useRpcClient({
-    rpcEndpoint: rpcEndpointQuery.data || '',
-    options: {
-      enabled: Boolean(rpcEndpointQuery.data),
-      staleTime: Infinity,
-    },
-  });
-
-  const isReady = Boolean(rpcClientQuery.data);
-  const isFetching = rpcEndpointQuery.isFetching || rpcClientQuery.isFetching;
+  const isReady = Boolean(rpcEndpointQuery.data);
+  const isFetching = rpcEndpointQuery.isFetching || rpcEndpointQuery.isFetching;
 
   return {
     isReady,
diff --git a/examples/authz/hooks/useSendData.ts b/examples/authz/hooks/useSendData.ts
@@ -5,7 +5,7 @@ import { shiftDigits } from '@/utils';
 import { useAuthzContext } from '@/context';
 import { getCoin, getExponent } from '@/configs';
 import { useQueryHooks } from './useQueryHooks';
-import { useGetBalance } from 'interchain-react/cosmos/bank/v1beta1/query.rpc.func';
+import { useGetBalance } from '@interchainjs/react/cosmos/bank/v1beta1/query.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
 
 export const useSendData = (chainName: string) => {
@@ -20,7 +20,9 @@ export const useSendData = (chainName: string) => {
     isReady: isQueryHooksReady,
     isFetching: isQueryHooksFetching,
     rpcEndpoint,
-  } = useQueryHooks(chainName);
+  } = useQueryHooks(chainName, {
+    context: defaultContext,
+  });
 
   const balanceQuery = useGetBalance({
     request: {
diff --git a/examples/authz/hooks/useStakingData.ts b/examples/authz/hooks/useStakingData.ts
@@ -15,23 +15,23 @@ import {
 } from '@/utils';
 import { useAuthzContext } from '@/context';
 import { useQueryHooks } from './useQueryHooks';
-import { useGetBalance } from 'interchain-react/cosmos/bank/v1beta1/query.rpc.func';
+import { useGetBalance } from '@interchainjs/react/cosmos/bank/v1beta1/query.rpc.react';
 import {
   useGetDelegatorDelegations,
   useGetDelegatorValidators,
   useGetParams as useGetStakingParams,
   useGetPool,
   useGetValidators,
-} from 'interchain-react/cosmos/staking/v1beta1/query.rpc.func';
+} from '@interchainjs/react/cosmos/staking/v1beta1/query.rpc.react';
 import {
   useGetDelegationTotalRewards,
   useGetParams as useGetDistributionParams,
-} from 'interchain-react/cosmos/distribution/v1beta1/query.rpc.func';
-import { useGetAnnualProvisions } from 'interchain-react/cosmos/mint/v1beta1/query.rpc.func';
+} from '@interchainjs/react/cosmos/distribution/v1beta1/query.rpc.react';
+import { useGetAnnualProvisions } from '@interchainjs/react/cosmos/mint/v1beta1/query.rpc.react';
 import {
   BondStatus,
   bondStatusToJSON,
-} from 'interchain-react/cosmos/staking/v1beta1/staking';
+} from '@interchainjs/react/cosmos/staking/v1beta1/staking';
 import { defaultContext } from '@tanstack/react-query';
 
 (BigInt.prototype as any).toJSON = function () {
@@ -50,7 +50,9 @@ export const useStakingData = (chainName: string) => {
     rpcEndpoint,
     isReady: isQueryHooksReady,
     isFetching: isQueryHooksFetching,
-  } = useQueryHooks(chainName);
+  } = useQueryHooks(chainName, {
+    context: defaultContext,
+  });
 
   const balanceQuery = useGetBalance({
     request: {
diff --git a/examples/authz/hooks/useValidators.ts b/examples/authz/hooks/useValidators.ts
@@ -7,11 +7,11 @@ import { useQueryHooks } from './useQueryHooks';
 import {
   BondStatus,
   bondStatusToJSON,
-} from 'interchain-react/cosmos/staking/v1beta1/staking';
+} from '@interchainjs/react/cosmos/staking/v1beta1/staking';
 import {
   useGetValidator,
   useGetValidators,
-} from 'interchain-react/cosmos/staking/v1beta1/query.rpc.func';
+} from '@interchainjs/react/cosmos/staking/v1beta1/query.rpc.react';
 
 (BigInt.prototype as any).toJSON = function () {
   return this.toString();
@@ -29,7 +29,9 @@ export const useValidators = (
     rpcEndpoint,
     isReady: isQueryHooksReady,
     isFetching: isQueryHooksFetching,
-  } = useQueryHooks(chainName);
+  } = useQueryHooks(chainName, {
+    context: defaultContext,
+  });
 
   const validatorsQuery = useGetValidators({
     request: {
diff --git a/examples/authz/hooks/useVotingData.ts b/examples/authz/hooks/useVotingData.ts
@@ -1,6 +1,6 @@
 import { useEffect, useMemo, useState } from 'react';
 import { defaultContext, useQueries } from '@tanstack/react-query';
-import { ProposalStatus } from 'interchain-react/cosmos/gov/v1beta1/gov';
+import { ProposalStatus } from '@interchainjs/react/cosmos/gov/v1beta1/gov';
 
 import { paginate, parseQuorum, processProposals } from '@/utils';
 import { useQueryHooks } from './useQueryHooks';
@@ -10,14 +10,14 @@ import {
   useGetProposals,
   useGetParams as useGetGovParams,
   useGetVote,
-  createGetVote,
-} from 'interchain-react/cosmos/gov/v1beta1/query.rpc.func';
+} from '@interchainjs/react/cosmos/gov/v1beta1/query.rpc.react';
+import { createGetVote } from "@interchainjs/react/cosmos/gov/v1beta1/query.rpc.func";
 import {
   useGetDelegatorDelegations,
   useGetDelegatorValidators,
   useGetPool,
   useGetValidators,
-} from 'interchain-react/cosmos/staking/v1beta1/query.rpc.func';
+} from '@interchainjs/react/cosmos/staking/v1beta1/query.rpc.react';
 
 (BigInt.prototype as any).toJSON = function () {
   return this.toString();
@@ -33,7 +33,13 @@ export function useVotingData(chainName: string) {
 
   const address = permission?.granter;
 
-  const { rpcEndpoint, isReady, isFetching } = useQueryHooks(chainName);
+  const {
+    rpcEndpoint,
+    isReady,
+    isFetching,
+  } = useQueryHooks(chainName, {
+    context: defaultContext,
+  });
 
   const proposalsQuery = useGetProposals({
     request: {
diff --git a/examples/authz/package.json b/examples/authz/package.json
@@ -46,15 +46,14 @@
     "@cosmos-kit/react": "2.21.2",
     "@interchain-ui/react": "1.23.22",
     "@interchain-ui/react-no-ssr": "^0.1.6",
-    "@interchainjs/cosmos": "1.6.3",
+    "@interchainjs/cosmos": "1.8.1",
+    "@interchainjs/react": "1.8.1",
     "@tanstack/react-query": "4.32.0",
     "bignumber.js": "9.1.0",
     "chain-registry": "^1.69.32",
     "cosmos-kit": "2.23.4",
     "dayjs": "1.11.10",
     "fast-fuzzy": "^1.12.0",
-    "interchain-query": "1.10.1",
-    "interchain-react": "1.7.2",
     "next": "^13",
     "react": "18.2.0",
     "react-calendar": "4.8.0",
diff --git a/examples/authz/utils/authz.ts b/examples/authz/utils/authz.ts
@@ -5,12 +5,12 @@ import { GetServerSideProps } from 'next';
 import {
   GenericAuthorization,
   GrantAuthorization,
-} from 'interchain-react/cosmos/authz/v1beta1/authz';
-import { SendAuthorization } from 'interchain-react/cosmos/bank/v1beta1/authz';
+} from '@interchainjs/react/cosmos/authz/v1beta1/authz';
+import { SendAuthorization } from '@interchainjs/react/cosmos/bank/v1beta1/authz';
 import {
   authorizationTypeToJSON,
   StakeAuthorization,
-} from 'interchain-react/cosmos/staking/v1beta1/authz';
+} from '@interchainjs/react/cosmos/staking/v1beta1/authz';
 
 import { shiftDigits } from './calc';
 import { ExtendedValidator } from './staking';
diff --git a/examples/authz/utils/staking.ts b/examples/authz/utils/staking.ts
diff --git a/examples/authz/utils/vote.ts b/examples/authz/utils/vote.ts
diff --git a/examples/authz/yarn.lock b/examples/authz/yarn.lock
