Merge pull request #14 from hyperweb-io/upgrade-interchainjs-1.9.2

Zetazzz · web-flow · commit 85e639c02082 · 2025-02-08T19:18:02.000+08:00
Upgrade interchainjs 1.9.2
diff --git a/examples/authz/components/authz/GrantCard.tsx b/examples/authz/components/authz/GrantCard.tsx
@@ -53,10 +53,8 @@ export const GrantCard = ({
   const { refetch } = useGrants(chainName);
   const { setPermission } = useAuthzContext();
   const { createRevokeMsg } = useAuthzTx(chainName);
-  const { data: client } = useSigningClient(chainName);
 
   const { mutate: revoke } = useRevoke({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/components/authz/GrantDetailsModal.tsx b/examples/authz/components/authz/GrantDetailsModal.tsx
@@ -5,7 +5,7 @@ import { useState } from 'react';
 import { BasicModal, Box, Button } from '@interchain-ui/react';
 
 import { useAuthzTx, useGrants, useSigningClient } from '@/hooks';
-import { PrettyGrant, PrettyPermission } from '@/utils';
+import { getTokenByChainName, PrettyGrant, PrettyPermission } from '@/utils';
 import { PermissionDetailCard } from './PermissionDetailCard';
 import { useRevoke } from '@interchainjs/react/cosmos/authz/v1beta1/tx.rpc.react';
 import { defaultContext } from '@tanstack/react-query';
@@ -37,15 +37,14 @@ export const GrantDetailsModal = ({
   const { refetch } = useGrants(chainName);
   const { createRevokeMsg } = useAuthzTx(chainName);
 
-  const { data: client } = useSigningClient(chainName);
-
   const { mutate: revoke } = useRevoke({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
   });
 
+  const token = getTokenByChainName(chainName);
+
   const handleRevoke = (permissions: PrettyPermission[]) => {
     setIsRevoking(true);
 
diff --git a/examples/authz/components/authz/GrantModal.tsx b/examples/authz/components/authz/GrantModal.tsx
@@ -73,10 +73,8 @@ export const GrantModal = ({ isOpen, onClose, chainName }: GrantModalProps) => {
   const { refetch } = useGrants(chainName);
   const { address } = useChain(chainName);
   const { createGrantMsg } = useAuthzTx(chainName);
-  const { data: client } = useSigningClient(chainName);
 
   const { mutate: grant } = useGrant({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/components/claim-rewards/Overview.tsx b/examples/authz/components/claim-rewards/Overview.tsx
@@ -41,10 +41,7 @@ const Overview = ({
   const { permission } = useAuthzContext();
   const { createExecMsg } = useAuthzTx(chainName);
 
-  const { data: client } = useSigningClient(chainName);
-
   const { mutate: exec } = useExec({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/components/send/send.tsx b/examples/authz/components/send/send.tsx
@@ -34,10 +34,8 @@ export const SendSection = ({ chainName }: SendSectionProps) => {
   const { status } = useChain(chainName);
   const { data, isLoading, refetch } = useSendData(chainName);
   const { createExecMsg } = useAuthzTx(chainName);
-  const { data: client } = useSigningClient(chainName);
 
   const { mutate: exec } = useExec({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/components/staking/DelegateModal.tsx b/examples/authz/components/staking/DelegateModal.tsx
@@ -71,10 +71,7 @@ export const DelegateModal = ({
 
   const { createExecMsg } = useAuthzTx(chainName);
 
-  const { data: client } = useSigningClient(chainName);
-
   const { mutate: exec } = useExec({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/components/staking/Overview.tsx b/examples/authz/components/staking/Overview.tsx
@@ -39,12 +39,9 @@ const Overview = ({
   const [isClaiming, setIsClaiming] = useState(false);
   const { address } = useChain(chainName);
 
-  const { data: client } = useSigningClient(chainName);
-
   const totalAmount = sum(balance, staked, rewards?.total ?? 0);
   const coin = getCoin(chainName);
   const withdrawDelegatorReward = useWithdrawDelegatorReward({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/components/voting/Proposal.tsx b/examples/authz/components/voting/Proposal.tsx
@@ -73,10 +73,8 @@ export function Proposal({
   const exponent = getExponent(chainName);
 
   const { createExecMsg } = useAuthzTx(chainName);
-  const { data: client } = useSigningClient(chainName);
 
   const { mutate: exec } = useExec({
-    clientResolver: client,
     options: {
       context: defaultContext,
     },
diff --git a/examples/authz/configs/defaults.ts b/examples/authz/configs/defaults.ts
@@ -1,7 +1,7 @@
 import { assetLists } from '@chain-registry/v2';
 import { AssetList, Asset } from '@chain-registry/v2-types';
 
-export const defaultChainName = 'osmosis';
+export const defaultChainName = 'juno';
 
 export const getChainAssets = (chainName: string = defaultChainName) => {
   return assetLists.find((chain) => chain.chainName === chainName) as AssetList;
@@ -16,4 +16,4 @@ export const getExponent = (chainName: string) => {
   return getCoin(chainName).denomUnits.find(
     (unit) => unit.denom === getCoin(chainName).display
   )?.exponent as number;
-};
+};
diff --git a/examples/authz/hooks/useGrants.ts b/examples/authz/hooks/useGrants.ts
@@ -1,9 +1,8 @@
 import { useEffect, useMemo, useRef } from 'react';
 import { useChain } from '@interchain-kit/react';
-import { defaultContext, useQuery } from '@tanstack/react-query';
+import { defaultContext } from '@tanstack/react-query';
 
 import { prettyGrants } from '@/utils';
-import { useQueryHooks } from './useQueryHooks';
 import {
   useGetGranteeGrants,
   useGetGranterGrants,
@@ -13,21 +12,15 @@ export const useGrants = (chainName: string) => {
   const { address } = useChain(chainName);
   const prevAddressRef = useRef(address);
 
-  const { rpcEndpoint, isFetching: isRpcQueryClientLoading } =
-    useQueryHooks(chainName, {
-      context: defaultContext,
-    });
-
   const granterGrantsQuery = useGetGranterGrants({
     request: {
       granter: address || '',
     },
     options: {
       context: defaultContext,
-      enabled: !!address && !!rpcEndpoint,
+      enabled: !!address,
       select: (data) => data?.grants,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const granteeGrantsQuery = useGetGranteeGrants({
@@ -36,10 +29,9 @@ export const useGrants = (chainName: string) => {
     },
     options: {
       context: defaultContext,
-      enabled: !!address && !!rpcEndpoint,
+      enabled: !!address,
       select: (data) => data?.grants,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const dataQueries = {
@@ -71,10 +63,9 @@ export const useGrants = (chainName: string) => {
     ({ isRefetching }) => isRefetching
   );
 
-  const isLoading =
-    isRpcQueryClientLoading || isInitialFetching || isRefetching;
+  const isLoading = isInitialFetching || isRefetching;
 
-  const isError = !rpcEndpoint && !isRpcQueryClientLoading;
+  const isError = false;
 
   type DataQueries = typeof dataQueries;
 
diff --git a/examples/authz/hooks/useSendData.ts b/examples/authz/hooks/useSendData.ts
@@ -19,7 +19,6 @@ export const useSendData = (chainName: string) => {
   const {
     isReady: isQueryHooksReady,
     isFetching: isQueryHooksFetching,
-    rpcEndpoint,
   } = useQueryHooks(chainName, {
     context: defaultContext,
   });
@@ -35,7 +34,6 @@ export const useSendData = (chainName: string) => {
       select: ({ balance }) => shiftDigits(balance?.amount || '0', -exp),
       staleTime: 0,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const pricesQuery = usePrices();
diff --git a/examples/authz/hooks/useStakingData.ts b/examples/authz/hooks/useStakingData.ts
@@ -47,7 +47,6 @@ export const useStakingData = (chainName: string) => {
   const exp = getExponent(chainName);
 
   const {
-    rpcEndpoint,
     isReady: isQueryHooksReady,
     isFetching: isQueryHooksFetching,
   } = useQueryHooks(chainName, {
@@ -64,7 +63,6 @@ export const useStakingData = (chainName: string) => {
       enabled: isQueryHooksReady && !!address,
       select: ({ balance }) => shiftDigits(balance?.amount || '0', -exp),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const myValidatorsQuery = useGetDelegatorValidators({
@@ -76,7 +74,6 @@ export const useStakingData = (chainName: string) => {
       enabled: isQueryHooksReady && !!address,
       select: ({ validators }) => parseValidators(validators),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const rewardsQuery = useGetDelegationTotalRewards({
@@ -88,7 +85,6 @@ export const useStakingData = (chainName: string) => {
       enabled: isQueryHooksReady && !!address,
       select: (data) => parseRewards(data, coin.base, -exp),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const validatorsQuery = useGetValidators({
@@ -112,7 +108,6 @@ export const useStakingData = (chainName: string) => {
         return parseValidators(sorted);
       },
     },
-    clientResolver: rpcEndpoint,
   });
 
   const delegationsQuery = useGetDelegatorDelegations({
@@ -132,7 +127,6 @@ export const useStakingData = (chainName: string) => {
       select: ({ delegationResponses }) =>
         parseDelegations(delegationResponses, -exp),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const unbondingDaysQuery = useGetStakingParams<string>({
@@ -142,7 +136,6 @@ export const useStakingData = (chainName: string) => {
       enabled: isQueryHooksReady,
       select: ({ params }) => parseUnbondingDays(params),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const annualProvisionsQuery = useGetAnnualProvisions({
@@ -153,7 +146,6 @@ export const useStakingData = (chainName: string) => {
       select: parseAnnualProvisions,
       retry: false,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const poolQuery = useGetPool({
@@ -163,7 +155,6 @@ export const useStakingData = (chainName: string) => {
       enabled: isQueryHooksReady,
       select: ({ pool }) => pool,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const communityTaxQuery = useGetDistributionParams({
@@ -173,7 +164,6 @@ export const useStakingData = (chainName: string) => {
       enabled: isQueryHooksReady,
       select: ({ params }) => shiftDigits(params?.communityTax || '0', -18),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const pricesQuery = usePrices();
diff --git a/examples/authz/hooks/useTx.ts b/examples/authz/hooks/useTx.ts
@@ -1,13 +1,11 @@
 import { useChain } from '@interchain-kit/react';
-import { isDeliverTxSuccess, StdFee } from '@cosmjs/stargate';
-import { useToast, type CustomToast } from './useToast';
-import { useQuery } from '@tanstack/react-query';
+import { StdFee } from '@cosmjs/stargate';
+import { type CustomToast } from './useToast';
+import { defaultContext, useQuery } from '@tanstack/react-query';
 
-import { SigningClient } from '@interchainjs/cosmos/signing-client';
-import {
-  AminoGenericOfflineSigner,
-  DirectGenericOfflineSigner,
-} from '@interchainjs/cosmos/types/wallet';
+
+import { DEFAULT_SIGNING_CLIENT_QUERY_KEY } from '@interchainjs/react/react-query';
+import { WalletState } from '@interchain-kit/core';
 
 interface Msg {
   typeUrl: string;
@@ -26,17 +24,25 @@ export enum TxStatus {
   Broadcasting = 'Transaction Broadcasting',
 }
 
-export const useSigningClient = (chainName: string) => {
+export const useSigningClient = (
+  chainName: string,
+  options: {
+    walletStatus?: WalletState;
+  }
+) => {
   const { getSigningClient } = useChain(chainName);
 
   return useQuery(
-    ['signingClient', chainName],
+    [DEFAULT_SIGNING_CLIENT_QUERY_KEY, chainName],
     async () => {
       const client = await getSigningClient();
       return client;
     },
     {
-      enabled: !!chainName,
+      enabled:
+        !!chainName &&
+        (!options || options?.walletStatus === WalletState.Connected),
+      context: defaultContext,
     }
   );
-};
+};
diff --git a/examples/authz/hooks/useValidators.ts b/examples/authz/hooks/useValidators.ts
@@ -26,7 +26,6 @@ export const useValidators = (
   { fetchLogos = true }: UseValidatorsConfig = {}
 ) => {
   const {
-    rpcEndpoint,
     isReady: isQueryHooksReady,
     isFetching: isQueryHooksFetching,
   } = useQueryHooks(chainName, {
@@ -58,7 +57,6 @@ export const useValidators = (
       },
       staleTime: Infinity,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const validatorLogosQuery = useQuery({
diff --git a/examples/authz/hooks/useVotingData.ts b/examples/authz/hooks/useVotingData.ts
@@ -34,7 +34,6 @@ export function useVotingData(chainName: string) {
   const address = permission?.granter;
 
   const {
-    rpcEndpoint,
     isReady,
     isFetching,
   } = useQueryHooks(chainName, {
@@ -54,7 +53,6 @@ export function useVotingData(chainName: string) {
       staleTime: Infinity,
       select: ({ proposals }) => processProposals(proposals),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const bondedTokensQuery = useGetPool({
@@ -65,7 +63,6 @@ export function useVotingData(chainName: string) {
       staleTime: Infinity,
       select: ({ pool }) => pool?.bondedTokens,
     },
-    clientResolver: rpcEndpoint,
   });
 
   const quorumQuery = useGetGovParams({
@@ -78,7 +75,6 @@ export function useVotingData(chainName: string) {
       staleTime: Infinity,
       select: ({ tallyParams }) => parseQuorum(tallyParams?.quorum),
     },
-    clientResolver: rpcEndpoint,
   });
 
   const votedProposalsQuery = useGetProposals({
@@ -94,10 +90,9 @@ export function useVotingData(chainName: string) {
       select: ({ proposals }) => proposals,
       keepPreviousData: true,
     },
-    clientResolver: rpcEndpoint,
   });
 
-  const getVote = createGetVote(rpcEndpoint);
+  const getVote = createGetVote(chainName);
 
   const votesQueries = useQueries({
     queries: (votedProposalsQuery.data || []).map(({ proposalId }) => ({
@@ -108,7 +103,7 @@ export function useVotingData(chainName: string) {
           voter: address || '',
         }),
       enabled:
-        Boolean(rpcEndpoint) &&
+        Boolean(chainName) &&
         Boolean(address) &&
         Boolean(votedProposalsQuery.data),
       keepPreviousData: true,
diff --git a/examples/authz/package.json b/examples/authz/package.json
diff --git a/examples/authz/pages/index.tsx b/examples/authz/pages/index.tsx
diff --git a/examples/authz/utils/authz.ts b/examples/authz/utils/authz.ts
diff --git a/examples/authz/yarn.lock b/examples/authz/yarn.lock
diff --git a/examples/injective/package.json b/examples/injective/package.json
diff --git a/examples/injective/yarn.lock b/examples/injective/yarn.lock
diff --git a/yarn.lock b/yarn.lock
