Skip to content

Commit c386659

Browse files
ZetazzzZetazzz
authored
Merge pull request #24 from hyperweb-io/package-removals
Package removals
2 parents 9617fc7 + 772b5a0 commit c386659

File tree

32 files changed

+570
-383
lines changed

32 files changed

+570
-383
lines changed

‎boilerplates/website/pages/_app.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import {
99
useTheme,
1010
} from "@interchain-ui/react";
1111

12-
function CreateCosmosApp({ Component, pageProps }: AppProps) {
12+
function CreateInterchainApp({ Component, pageProps }: AppProps) {
1313
const { themeClass } = useTheme();
1414

1515
return (
@@ -26,4 +26,4 @@ function CreateCosmosApp({ Component, pageProps }: AppProps) {
2626
);
2727
}
2828

29-
export default CreateCosmosApp;
29+
export default CreateInterchainApp;

‎examples/authz/pages/_app.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const queryClient = new QueryClient({
3535
},
3636
});
3737

38-
function CreateCosmosApp({ Component, pageProps }: AppProps) {
38+
function CreateInterchainApp({ Component, pageProps }: AppProps) {
3939
const { themeClass } = useTheme();
4040

4141
return (
@@ -88,4 +88,4 @@ function CreateCosmosApp({ Component, pageProps }: AppProps) {
8888
);
8989
}
9090

91-
export default CreateCosmosApp;
91+
export default CreateInterchainApp;

‎examples/ibc-asset-list/hooks/queries/useAssets.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@ import { UseQueryResult } from '@tanstack/react-query';
55
import BigNumber from 'bignumber.js';
66
import { useEffect, useMemo } from 'react';
77
import { useChainUtils } from '../useChainUtils';
8-
import { useQueryHooks } from './useQueryHooks';
98
import { usePrices } from './usePrices';
109
import { useTopTokens } from './useTopTokens';
1110
import { getPagination } from './useTotalAssets';
11+
import { useGetAllBalances } from 'interchain-react/cosmos/bank/v1beta1/query.rpc.func'
12+
import { defaultContext } from '@tanstack/react-query';
1213

1314
(BigInt.prototype as any).toJSON = function () {
1415
return this.toString();
@@ -17,18 +18,19 @@ import { getPagination } from './useTotalAssets';
1718
const MAX_TOKENS_TO_SHOW = 50;
1819

1920
export const useAssets = (chainName: string) => {
20-
const { address } = useChain(chainName);
21-
22-
const { cosmosQuery, isReady, isFetching } = useQueryHooks(chainName);
21+
const { address, rpcEndpoint } = useChain(chainName);
2322

2423
const allBalancesQuery: UseQueryResult<Coin[]> =
25-
cosmosQuery.bank.v1beta1.useAllBalances({
24+
useGetAllBalances({
25+
clientResolver: rpcEndpoint,
2626
request: {
2727
address: address || '',
2828
pagination: getPagination(100n),
29+
resolveDenom: false
2930
},
3031
options: {
31-
enabled: isReady,
32+
context: defaultContext,
33+
enabled: !!rpcEndpoint,
3234
select: ({ balances }) => balances || [],
3335
},
3436
});
@@ -53,7 +55,7 @@ export const useAssets = (chainName: string) => {
5355
const queries = Object.values(dataQueries);
5456
const isInitialFetching = queries.some(({ isLoading }) => isLoading);
5557
const isRefetching = queries.some(({ isRefetching }) => isRefetching);
56-
const isLoading = isFetching || isInitialFetching || isRefetching;
58+
const isLoading = allBalancesQuery.isFetching || isInitialFetching || isRefetching;
5759

5860
type AllQueries = typeof dataQueries;
5961

‎examples/ibc-asset-list/hooks/queries/useBalance.ts

+9-11
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@ import { Coin } from '@interchainjs/cosmos-types/types';
22
import { useChain } from '@interchain-kit/react';
33
import { UseQueryResult } from '@tanstack/react-query';
44
import { useEffect } from 'react';
5-
import { useQueryHooks } from './useQueryHooks';
5+
import { useGetBalance } from 'interchain-react/cosmos/bank/v1beta1/query.rpc.func';
6+
import { defaultContext } from '@tanstack/react-query';
67

78
export const useBalance = (chainName: string, enabled: boolean = true,
89
displayDenom?: string
910
) => {
10-
const { address, assetList } = useChain(chainName);
11+
const { address, assetList, rpcEndpoint } = useChain(chainName);
1112
let denom = assetList?.assets[0].base!;
1213
for (const asset of assetList?.assets || []) {
1314
if (asset.display.toLowerCase() === displayDenom?.toLowerCase()) {
@@ -16,19 +17,16 @@ export const useBalance = (chainName: string, enabled: boolean = true,
1617
}
1718
}
1819

19-
const { cosmosQuery, isReady, isFetching } = useQueryHooks(
20-
chainName,
21-
'balance'
22-
);
23-
24-
const balanceQuery: UseQueryResult<Coin> =
25-
cosmosQuery.bank.v1beta1.useBalance({
20+
const balanceQuery: UseQueryResult<Coin | undefined> =
21+
useGetBalance({
22+
clientResolver: rpcEndpoint,
2623
request: {
2724
denom,
2825
address: address || '',
2926
},
3027
options: {
31-
enabled: isReady && enabled,
28+
context: defaultContext,
29+
enabled: !!rpcEndpoint && enabled,
3230
select: ({ balance }) => balance,
3331
},
3432
});
@@ -42,6 +40,6 @@ export const useBalance = (chainName: string, enabled: boolean = true,
4240

4341
return {
4442
balance: balanceQuery.data,
45-
isLoading: isFetching // || !!balanceQueries.find(item => item.isFetching),
43+
isLoading: balanceQuery.isFetching // || !!balanceQueries.find(item => item.isFetching),
4644
};
4745
};

‎examples/ibc-asset-list/hooks/queries/useQueryHooks.ts

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { useChain } from '@interchain-kit/react';
2-
import { createRpcQueryHooks } from 'osmo-query';
32
import { useRpcClient } from 'interchain-react/react-query';
43
import { useRpcEndpoint } from 'interchain-react/react-query'
54
import { defaultContext } from '@tanstack/react-query';
@@ -21,7 +20,6 @@ export const useQueryHooks = (chainName: string, extraKey?: string) => {
2120
});
2221

2322
const rpcClientQuery = useRpcClient({
24-
// rpcEndpoint: rpcEndpointQuery.data || '',
2523
clientResolver: {
2624
rpcEndpoint: rpcEndpointQuery.data,
2725
},
@@ -35,12 +33,8 @@ export const useQueryHooks = (chainName: string, extraKey?: string) => {
3533
},
3634
});
3735

38-
const { cosmos: cosmosQuery, osmosis: osmosisQuery } = createRpcQueryHooks({
39-
rpc: rpcClientQuery.data,
40-
});
41-
4236
const isReady = !!address && !!rpcClientQuery.data;
4337
const isFetching = rpcEndpointQuery.isFetching || rpcClientQuery.isFetching;
4438

45-
return { cosmosQuery, osmosisQuery, isReady, isFetching };
39+
return { isReady, isFetching };
4640
};

‎examples/ibc-asset-list/hooks/queries/useTotalAssets.ts

+16-95
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@ import BigNumber from 'bignumber.js';
55
import { useEffect, useMemo } from 'react';
66
import { useChainUtils } from '../useChainUtils';
77
import { usePrices } from './usePrices';
8-
import { defaultChainName as osmoChainName } from '@/config';
9-
import { Pool } from '@/types/pool-models';
10-
import { convertGammTokenToDollarValue } from '@/utils';
11-
import { useQueryHooks } from './useQueryHooks';
8+
import { useGetAllBalances } from 'interchain-react/cosmos/bank/v1beta1/query.rpc.func'
9+
import { defaultContext } from '@tanstack/react-query';
10+
import { useGetDelegatorDelegations } from 'interchain-react/cosmos/staking/v1beta1/query.rpc.func';
1211

1312
(BigInt.prototype as any).toJSON = function () {
1413
return this.toString();
@@ -23,71 +22,43 @@ export const getPagination = (limit: bigint) => ({
2322
});
2423

2524
export const useTotalAssets = (chainName: string) => {
26-
const { address } = useChain(chainName);
27-
28-
const { cosmosQuery, osmosisQuery, isReady, isFetching } =
29-
useQueryHooks(chainName);
30-
31-
const isOsmosisChain = chainName === osmoChainName;
25+
const { address, rpcEndpoint } = useChain(chainName);
3226

3327
const allBalancesQuery: UseQueryResult<Coin[]> =
34-
cosmosQuery.bank.v1beta1.useAllBalances({
28+
useGetAllBalances({
29+
clientResolver: rpcEndpoint,
3530
request: {
3631
address: address || '',
3732
pagination: getPagination(100n),
33+
resolveDenom: false
3834
},
3935
options: {
40-
enabled: isReady,
36+
context: defaultContext,
37+
enabled: !!rpcEndpoint,
4138
select: ({ balances }) => balances || [],
4239
},
4340
});
4441

4542
const delegationsQuery: UseQueryResult<Coin[]> =
46-
cosmosQuery.staking.v1beta1.useDelegatorDelegations({
43+
useGetDelegatorDelegations({
4744
request: {
4845
delegatorAddr: address || '',
4946
pagination: getPagination(100n),
5047
},
5148
options: {
52-
enabled: isReady,
49+
context: defaultContext,
50+
enabled: !!rpcEndpoint,
5351
select: ({ delegationResponses }) =>
5452
delegationResponses.map(({ balance }) => balance) || [],
5553
},
5654
});
5755

58-
const lockedCoinsQuery: UseQueryResult<Coin[]> =
59-
osmosisQuery.lockup.useAccountLockedCoins({
60-
request: {
61-
owner: address || '',
62-
},
63-
options: {
64-
enabled: isReady && isOsmosisChain,
65-
select: ({ coins }) => coins || [],
66-
staleTime: Infinity,
67-
},
68-
});
69-
70-
const poolsQuery: UseQueryResult<Pool[]> = osmosisQuery.gamm.v1beta1.usePools(
71-
{
72-
request: {
73-
pagination: getPagination(5000n),
74-
},
75-
options: {
76-
enabled: isReady && isOsmosisChain,
77-
select: ({ pools }) => pools || [],
78-
staleTime: Infinity,
79-
},
80-
}
81-
);
82-
8356
const pricesQuery = usePrices(chainName);
8457

8558
const dataQueries = {
86-
pools: poolsQuery,
8759
prices: pricesQuery,
8860
allBalances: allBalancesQuery,
8961
delegations: delegationsQuery,
90-
lockedCoins: lockedCoinsQuery,
9162
};
9263

9364
const queriesToReset = [dataQueries.allBalances, dataQueries.delegations];
@@ -101,7 +72,7 @@ export const useTotalAssets = (chainName: string) => {
10172
const queries = Object.values(dataQueries);
10273
const isInitialFetching = queries.some(({ isFetching }) => isFetching);
10374
const isRefetching = queries.some(({ isRefetching }) => isRefetching);
104-
const isLoading = isFetching || isInitialFetching || isRefetching;
75+
const isLoading = delegationsQuery.isFetching || allBalancesQuery.isFetching || isInitialFetching || isRefetching;
10576

10677
type AllQueries = typeof dataQueries;
10778

@@ -122,68 +93,18 @@ export const useTotalAssets = (chainName: string) => {
12293

12394
const {
12495
allBalances,
125-
delegations,
126-
lockedCoins = [],
127-
pools = [],
12896
prices = {},
12997
} = queriesData;
13098

131-
const stakedTotal = delegations
132-
?.map((coin) => calcCoinDollarValue(prices, coin))
133-
.reduce((total, cur) => total.plus(cur), zero)
134-
.toString();
135-
13699
const balancesTotal = allBalances
137100
?.filter(({ denom }) => !denom.startsWith('gamm') && prices[denom])
138101
.map((coin) => calcCoinDollarValue(prices, coin))
139102
.reduce((total, cur) => total.plus(cur), zero)
140103
.toString();
141104

142-
let bondedTotal;
143-
let liquidityTotal;
144-
145-
if (isOsmosisChain) {
146-
const liquidityCoins = (allBalances ?? []).filter(({ denom }) =>
147-
denom.startsWith('gamm')
148-
);
149-
const gammTokenDenoms = [
150-
...(liquidityCoins ?? []),
151-
...(lockedCoins ?? []),
152-
].map(({ denom }) => denom);
153-
154-
const uniqueDenoms = [...new Set(gammTokenDenoms)];
155-
156-
const poolsMap: Record<string, Pool> = pools
157-
.filter(({ totalShares }) => uniqueDenoms.includes(totalShares.denom))
158-
.filter((pool) => !pool?.$typeUrl?.includes('stableswap'))
159-
.filter(({ poolAssets }) => {
160-
return poolAssets.every(({ token }) => {
161-
const isGammToken = token.denom.startsWith('gamm/pool');
162-
return !isGammToken && prices[token.denom];
163-
});
164-
})
165-
.reduce((prev, cur) => ({ ...prev, [cur.totalShares.denom]: cur }), {});
166-
167-
bondedTotal = lockedCoins
168-
.map((coin) => {
169-
const poolData = poolsMap[coin.denom];
170-
if (!poolData) return '0';
171-
return convertGammTokenToDollarValue(coin, poolData, prices);
172-
})
173-
.reduce((total, cur) => total.plus(cur), zero)
174-
.toString();
175-
176-
liquidityTotal = liquidityCoins
177-
.map((coin) => {
178-
const poolData = poolsMap[coin.denom];
179-
if (!poolData) return '0';
180-
return convertGammTokenToDollarValue(coin, poolData, prices);
181-
})
182-
.reduce((total, cur) => total.plus(cur), zero)
183-
.toString();
184-
}
185-
186-
const total = [stakedTotal, balancesTotal, bondedTotal, liquidityTotal]
105+
const total = [
106+
balancesTotal
107+
]
187108
.reduce((total, cur) => total.plus(cur || 0), zero)
188109
.decimalPlaces(2)
189110
.toString();

‎examples/ibc-asset-list/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
"@cosmjs/stargate": "^0.32.3",
2424
"@emotion/react": "11.10.6",
2525
"@emotion/styled": "11.10.6",
26-
"@interchain-kit/core": "0.2.203",
27-
"@interchain-kit/keplr-extension": "0.2.203",
28-
"@interchain-kit/leap-extension": "0.2.203",
29-
"@interchain-kit/react": "0.2.203",
26+
"@interchain-kit/core": "0.2.205",
27+
"@interchain-kit/keplr-extension": "0.2.205",
28+
"@interchain-kit/leap-extension": "0.2.205",
29+
"@interchain-kit/react": "0.2.205",
3030
"@interchain-ui/react": "1.26.0",
3131
"@interchain-ui/react-no-ssr": "^0.1.6",
3232
"@interchainjs/cosmos": "1.8.2",

‎examples/ibc-asset-list/pages/_app.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const queryClient = new QueryClient({
2121
},
2222
});
2323

24-
function CreateCosmosApp({ Component, pageProps }: AppProps) {
24+
function CreateInterchainApp({ Component, pageProps }: AppProps) {
2525
const { themeClass } = useTheme();
2626

2727
return (
@@ -52,4 +52,4 @@ function CreateCosmosApp({ Component, pageProps }: AppProps) {
5252
);
5353
}
5454

55-
export default CreateCosmosApp;
55+
export default CreateInterchainApp;

0 commit comments

Comments
 (0)