@0xsquid/react-hooks 6.4.7-beta.3 → 6.4.7-keplr-btc-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/core/connectors/bitcoin/errors/index.d.ts +1 -2
- package/dist/core/connectors/bitcoin/errors/index.js +1 -1
- package/dist/core/connectors/bitcoin/errors/index.js.map +1 -1
- package/dist/core/connectors/bitcoin/wallets/index.d.ts +1 -0
- package/dist/core/connectors/bitcoin/wallets/index.js +1 -0
- package/dist/core/connectors/bitcoin/wallets/index.js.map +1 -1
- package/dist/core/connectors/bitcoin/wallets/keplr.d.ts +11 -0
- package/dist/core/connectors/bitcoin/wallets/keplr.js +28 -0
- package/dist/core/connectors/bitcoin/wallets/keplr.js.map +1 -0
- package/dist/core/constants.d.ts +4 -7
- package/dist/core/constants.js +4 -21
- package/dist/core/constants.js.map +1 -1
- package/dist/core/externalLinks.d.ts +1 -1
- package/dist/core/externalLinks.js +1 -1
- package/dist/core/index.d.ts +1 -1
- package/dist/core/index.js +1 -1
- package/dist/core/index.js.map +1 -1
- package/dist/core/providers/CosmosProvider.d.ts +1 -1
- package/dist/core/providers/CosmosProvider.js.map +1 -1
- package/dist/core/queries/queries-keys.d.ts +4 -4
- package/dist/core/types/error.d.ts +1 -0
- package/dist/core/types/error.js.map +1 -1
- package/dist/core/types/transaction.d.ts +1 -0
- package/dist/core/types/wallet.d.ts +2 -19
- package/dist/core/types/wallet.js.map +1 -1
- package/dist/core/wallets.d.ts +1 -2
- package/dist/core/wallets.js +12 -2
- package/dist/core/wallets.js.map +1 -1
- package/dist/hooks/chains/useSquidChains.d.ts +0 -1
- package/dist/hooks/chains/useSquidChains.js +4 -23
- package/dist/hooks/chains/useSquidChains.js.map +1 -1
- package/dist/hooks/cosmos/useCosmos.js +20 -15
- package/dist/hooks/cosmos/useCosmos.js.map +1 -1
- package/dist/hooks/index.d.ts +0 -1
- package/dist/hooks/index.js +0 -1
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/solana/useSolana.js +2 -8
- package/dist/hooks/solana/useSolana.js.map +1 -1
- package/dist/hooks/store/useWalletStore.d.ts +5 -5
- package/dist/hooks/store/useWalletStore.js +20 -13
- package/dist/hooks/store/useWalletStore.js.map +1 -1
- package/dist/hooks/swap/useSwap.js +3 -3
- package/dist/hooks/swap/useSwap.js.map +1 -1
- package/dist/hooks/tokens/useAllConnectedWalletBalances.js +1 -12
- package/dist/hooks/tokens/useAllConnectedWalletBalances.js.map +1 -1
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.d.ts +5 -4
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js +17 -30
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js.map +1 -1
- package/dist/hooks/tokens/useBalance.d.ts +246 -18
- package/dist/hooks/tokens/useBalance.js +25 -66
- package/dist/hooks/tokens/useBalance.js.map +1 -1
- package/dist/hooks/tokens/useMultiChainBalance.d.ts +2 -2
- package/dist/hooks/tokens/useMultiChainBalance.js +35 -38
- package/dist/hooks/tokens/useMultiChainBalance.js.map +1 -1
- package/dist/hooks/tokens/useNativeBalance.d.ts +18 -16
- package/dist/hooks/tokens/useNativeBalance.js +56 -121
- package/dist/hooks/tokens/useNativeBalance.js.map +1 -1
- package/dist/hooks/tokens/useNativeTokenForChain.js +4 -6
- package/dist/hooks/tokens/useNativeTokenForChain.js.map +1 -1
- package/dist/hooks/tokens/useSquidTokens.d.ts +11 -2
- package/dist/hooks/tokens/useSquidTokens.js +16 -8
- package/dist/hooks/tokens/useSquidTokens.js.map +1 -1
- package/dist/hooks/transaction/useEstimate.js +1 -1
- package/dist/hooks/transaction/useEstimate.js.map +1 -1
- package/dist/hooks/transaction/useExecuteTransaction.d.ts +2 -0
- package/dist/hooks/transaction/useExecuteTransaction.js +39 -81
- package/dist/hooks/transaction/useExecuteTransaction.js.map +1 -1
- package/dist/hooks/transaction/useGetRoute.d.ts +2 -1
- package/dist/hooks/transaction/useGetRoute.js +2 -2
- package/dist/hooks/transaction/useGetRoute.js.map +1 -1
- package/dist/hooks/transaction/useSingleTransaction.js +1 -1
- package/dist/hooks/transaction/useSingleTransaction.js.map +1 -1
- package/dist/hooks/user/useUserParams.js +1 -1
- package/dist/hooks/user/useUserParams.js.map +1 -1
- package/dist/hooks/wallet/useIntegratorContext.js +1 -1
- package/dist/hooks/wallet/useIntegratorContext.js.map +1 -1
- package/dist/hooks/wallet/useMultiChainWallet.d.ts +3 -1
- package/dist/hooks/wallet/useMultiChainWallet.js +25 -32
- package/dist/hooks/wallet/useMultiChainWallet.js.map +1 -1
- package/dist/hooks/wallet/useSigner.d.ts +2 -2
- package/dist/hooks/wallet/useSigner.js +7 -33
- package/dist/hooks/wallet/useSigner.js.map +1 -1
- package/dist/hooks/wallet/useWallet.d.ts +6 -24
- package/dist/hooks/wallet/useWallet.js +11 -25
- package/dist/hooks/wallet/useWallet.js.map +1 -1
- package/dist/hooks/wallet/useWallets.js +1 -26
- package/dist/hooks/wallet/useWallets.js.map +1 -1
- package/dist/provider/index.d.ts +1 -1
- package/dist/provider/index.js +8 -10
- package/dist/provider/index.js.map +1 -1
- package/dist/services/external/rpcService.d.ts +4 -8
- package/dist/services/external/rpcService.js +14 -38
- package/dist/services/external/rpcService.js.map +1 -1
- package/dist/services/internal/assetsService.d.ts +2 -2
- package/dist/services/internal/assetsService.js +5 -10
- package/dist/services/internal/assetsService.js.map +1 -1
- package/dist/services/internal/bitcoinService.d.ts +5 -3
- package/dist/services/internal/bitcoinService.js +9 -1
- package/dist/services/internal/bitcoinService.js.map +1 -1
- package/dist/services/internal/configService.js +2 -7
- package/dist/services/internal/configService.js.map +1 -1
- package/dist/services/internal/cosmosService.d.ts +14 -4
- package/dist/services/internal/cosmosService.js +1 -1
- package/dist/services/internal/cosmosService.js.map +1 -1
- package/dist/services/internal/errorService.d.ts +0 -15
- package/dist/services/internal/errorService.js +4 -34
- package/dist/services/internal/errorService.js.map +1 -1
- package/dist/services/internal/evmService.d.ts +6 -3
- package/dist/services/internal/evmService.js.map +1 -1
- package/dist/services/internal/solanaService.d.ts +6 -3
- package/dist/services/internal/solanaService.js.map +1 -1
- package/dist/services/internal/transactionService.d.ts +1 -0
- package/dist/services/internal/walletService.d.ts +15 -21
- package/dist/services/internal/walletService.js +28 -38
- package/dist/services/internal/walletService.js.map +1 -1
- package/dist/tests/swapConfig.test.js +7 -72
- package/dist/tests/swapConfig.test.js.map +1 -1
- package/package.json +8 -12
- package/dist/core/providers/SuiProvider.d.ts +0 -19
- package/dist/core/providers/SuiProvider.js +0 -15
- package/dist/core/providers/SuiProvider.js.map +0 -1
- package/dist/core/types/rpc.d.ts +0 -10
- package/dist/core/types/rpc.js +0 -2
- package/dist/core/types/rpc.js.map +0 -1
- package/dist/core/types/sui.d.ts +0 -14
- package/dist/core/types/sui.js +0 -2
- package/dist/core/types/sui.js.map +0 -1
- package/dist/hooks/sui/useSui.d.ts +0 -2
- package/dist/hooks/sui/useSui.js +0 -28
- package/dist/hooks/sui/useSui.js.map +0 -1
- package/dist/hooks/sui/useSuiClient.d.ts +0 -9
- package/dist/hooks/sui/useSuiClient.js +0 -16
- package/dist/hooks/sui/useSuiClient.js.map +0 -1
- package/dist/hooks/sui/useSuiWallets.d.ts +0 -7
- package/dist/hooks/sui/useSuiWallets.js +0 -36
- package/dist/hooks/sui/useSuiWallets.js.map +0 -1
- package/dist/services/external/suiRpcClient.d.ts +0 -32
- package/dist/services/external/suiRpcClient.js +0 -80
- package/dist/services/external/suiRpcClient.js.map +0 -1
- package/dist/services/internal/suiService.d.ts +0 -14
- package/dist/services/internal/suiService.js +0 -107
- package/dist/services/internal/suiService.js.map +0 -1
|
@@ -2,19 +2,18 @@ import { ChainType } from "@0xsquid/squid-types";
|
|
|
2
2
|
import { useMutation } from "@tanstack/react-query";
|
|
3
3
|
import { useCallback, useEffect, useMemo, useState } from "react";
|
|
4
4
|
import { CHAIN_IDS } from "../../core/constants";
|
|
5
|
+
import { useSwapRoutePersistStore } from "../../hooks/store/useSquidStore";
|
|
6
|
+
import { useSwap } from "../../hooks/swap/useSwap";
|
|
5
7
|
import { getCosmosChainInfosObject, getCosmosKey, } from "../../services/internal/cosmosService";
|
|
6
|
-
import { isUserRejectionError, normalizeError, } from "../../services/internal/errorService";
|
|
7
8
|
import { getConnectorForChainType } from "../../services/internal/walletService";
|
|
8
9
|
import { useSquidChains } from "../chains/useSquidChains";
|
|
9
10
|
import { useClient } from "../client/useClient";
|
|
10
|
-
import { useSwapRoutePersistStore } from "../store/useSquidStore";
|
|
11
11
|
import { useWalletStore } from "../store/useWalletStore";
|
|
12
|
-
import { useSwap } from "../swap/useSwap";
|
|
13
12
|
export const useCosmos = () => {
|
|
14
13
|
const cosmosWalletState = useWalletStore((state) => state.connectedWalletsByChainType[ChainType.COSMOS]);
|
|
15
|
-
const cosmosAddress = cosmosWalletState
|
|
14
|
+
const cosmosAddress = cosmosWalletState.address;
|
|
16
15
|
const isConnected = !!cosmosAddress;
|
|
17
|
-
const cosmosConnectedWallet = cosmosWalletState
|
|
16
|
+
const cosmosConnectedWallet = cosmosWalletState.wallet;
|
|
18
17
|
const [cosmosSigner, setCosmosSigner] = useState(undefined);
|
|
19
18
|
const [cosmosChainId, setCosmosChainId] = useState();
|
|
20
19
|
const { swapRoute } = useSwapRoutePersistStore();
|
|
@@ -23,12 +22,12 @@ export const useCosmos = () => {
|
|
|
23
22
|
const { clientWindow, isClient } = useClient();
|
|
24
23
|
const { setConnectedWallet, disconnectWallet } = useWalletStore();
|
|
25
24
|
const keplrTypeWallet = useMemo(() => {
|
|
26
|
-
if (!isClient || !cosmosWalletState
|
|
25
|
+
if (!isClient || !cosmosWalletState?.wallet) {
|
|
27
26
|
return undefined;
|
|
28
27
|
}
|
|
29
28
|
const connector = getConnectorForChainType(cosmosWalletState.wallet, ChainType.COSMOS);
|
|
30
29
|
return connector?.()?.provider;
|
|
31
|
-
}, [cosmosWalletState
|
|
30
|
+
}, [cosmosWalletState?.wallet, isClient]);
|
|
32
31
|
// As soon as from chain changes, need to fetch the new signer
|
|
33
32
|
useEffect(() => {
|
|
34
33
|
if (fromChain?.chainType === ChainType.COSMOS && keplrTypeWallet) {
|
|
@@ -50,12 +49,7 @@ export const useCosmos = () => {
|
|
|
50
49
|
*/
|
|
51
50
|
const updateWalletStore = useCallback(async (wallet, cosmosWalletObject, address) => {
|
|
52
51
|
const osmosisAddress = await getCosmosKey(CHAIN_IDS.OSMOSIS, cosmosWalletObject);
|
|
53
|
-
|
|
54
|
-
setConnectedWallet(ChainType.COSMOS, {
|
|
55
|
-
wallet: wallet,
|
|
56
|
-
address,
|
|
57
|
-
});
|
|
58
|
-
}
|
|
52
|
+
setConnectedWallet(wallet, address, ChainType.COSMOS);
|
|
59
53
|
useSwapRoutePersistStore.setState((state) => ({
|
|
60
54
|
...state,
|
|
61
55
|
swapRoute: {
|
|
@@ -73,9 +67,9 @@ export const useCosmos = () => {
|
|
|
73
67
|
}
|
|
74
68
|
}, [
|
|
75
69
|
cosmosChainId,
|
|
70
|
+
cosmosConnectedWallet,
|
|
76
71
|
keplrTypeWallet,
|
|
77
72
|
updateWalletStore,
|
|
78
|
-
cosmosConnectedWallet,
|
|
79
73
|
]);
|
|
80
74
|
useEffect(() => {
|
|
81
75
|
clientWindow?.addEventListener("keplr_keystorechange", () => handleKeplrAccountChanged());
|
|
@@ -119,7 +113,18 @@ export const useCosmos = () => {
|
|
|
119
113
|
}
|
|
120
114
|
}
|
|
121
115
|
catch (error) {
|
|
122
|
-
|
|
116
|
+
const e = error;
|
|
117
|
+
// TODO: need to keep this list updated
|
|
118
|
+
const rejectedErrorMessages = [
|
|
119
|
+
// Keplr
|
|
120
|
+
"Request rejected",
|
|
121
|
+
// Cosmostation
|
|
122
|
+
"User rejected the request.",
|
|
123
|
+
// Leap
|
|
124
|
+
"Chain approval rejected",
|
|
125
|
+
];
|
|
126
|
+
const isRejectedError = e.message && rejectedErrorMessages.includes(e.message);
|
|
127
|
+
if (!isRejectedError) {
|
|
123
128
|
if (cosmosWalletObject.experimentalSuggestChain) {
|
|
124
129
|
await cosmosWalletObject.experimentalSuggestChain(chainInfos);
|
|
125
130
|
return connectCosmos.mutateAsync({ chain, wallet });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useCosmos.js","sourceRoot":"","sources":["../../../src/hooks/cosmos/useCosmos.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGjD,OAAO,
|
|
1
|
+
{"version":3,"file":"useCosmos.js","sourceRoot":"","sources":["../../../src/hooks/cosmos/useCosmos.ts"],"names":[],"mappings":"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"}
|
package/dist/hooks/index.d.ts
CHANGED
|
@@ -38,6 +38,5 @@ export { useEnsDataForAddress, useEnsSearch } from "./wallet/useEns";
|
|
|
38
38
|
export { useGnosisContext, useIsSameAddressAndGnosisContext, } from "./wallet/useGnosisContext";
|
|
39
39
|
export { useIntegratorContext } from "./wallet/useIntegratorContext";
|
|
40
40
|
export { useMultiChainWallet } from "./wallet/useMultiChainWallet";
|
|
41
|
-
export { useSigner } from "./wallet/useSigner";
|
|
42
41
|
export { useWallet } from "./wallet/useWallet";
|
|
43
42
|
export { useWallets } from "./wallet/useWallets";
|
package/dist/hooks/index.js
CHANGED
|
@@ -38,7 +38,6 @@ export { useEnsDataForAddress, useEnsSearch } from "./wallet/useEns";
|
|
|
38
38
|
export { useGnosisContext, useIsSameAddressAndGnosisContext, } from "./wallet/useGnosisContext";
|
|
39
39
|
export { useIntegratorContext } from "./wallet/useIntegratorContext";
|
|
40
40
|
export { useMultiChainWallet } from "./wallet/useMultiChainWallet";
|
|
41
|
-
export { useSigner } from "./wallet/useSigner";
|
|
42
41
|
export { useWallet } from "./wallet/useWallet";
|
|
43
42
|
export { useWallets } from "./wallet/useWallets";
|
|
44
43
|
//# sourceMappingURL=index.js.map
|
package/dist/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EACL,sBAAsB,GAEvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EACL,cAAc,EACd,aAAa,EACb,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,aAAa,GACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EACL,gBAAgB,EAChB,gCAAgC,GACjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EACL,sBAAsB,GAEvB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EACL,cAAc,EACd,aAAa,EACb,wBAAwB,EACxB,mBAAmB,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EACL,iBAAiB,EACjB,aAAa,GACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EACL,gBAAgB,EAChB,gCAAgC,GACjC,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC"}
|
|
@@ -35,10 +35,7 @@ export const useSolana = () => {
|
|
|
35
35
|
const response = await walletObject.connect();
|
|
36
36
|
const address = response.publicKey.toString();
|
|
37
37
|
if (address) {
|
|
38
|
-
setConnectedWallet(ChainType.SOLANA
|
|
39
|
-
wallet: selectedWallet,
|
|
40
|
-
address,
|
|
41
|
-
});
|
|
38
|
+
setConnectedWallet(selectedWallet, address, ChainType.SOLANA);
|
|
42
39
|
return address;
|
|
43
40
|
}
|
|
44
41
|
return undefined;
|
|
@@ -57,10 +54,7 @@ export const useSolana = () => {
|
|
|
57
54
|
publicKey = parsedPublicKey;
|
|
58
55
|
}
|
|
59
56
|
if (publicKey && solanaConnectedWallet) {
|
|
60
|
-
setConnectedWallet(ChainType.SOLANA
|
|
61
|
-
wallet: solanaConnectedWallet,
|
|
62
|
-
address: publicKey,
|
|
63
|
-
});
|
|
57
|
+
setConnectedWallet(solanaConnectedWallet, publicKey, ChainType.SOLANA);
|
|
64
58
|
}
|
|
65
59
|
else {
|
|
66
60
|
clearData();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,UAAU,EAAa,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAUzD,MAAM,CAAC,MAAM,SAAS,GAAG,GAAuB,EAAE;IAChD,oDAAoD;IACpD,MAAM,iBAAiB,GAAG,cAAc,CACtC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,MAAM,CAAC,CAC/D,CAAC;IACF,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC;IAChD,MAAM,WAAW,GAAG,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,qBAAqB,GAAG,iBAAiB,CAAC,
|
|
1
|
+
{"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { Wallet } from "../../core/types";
|
|
3
|
-
import { ChainTypeToWalletState } from "../../core/types/wallet";
|
|
4
3
|
export declare enum ConnectingWalletStatus {
|
|
5
4
|
IDLE = 0,
|
|
6
5
|
CONNECTING = 1,
|
|
@@ -11,13 +10,14 @@ export interface ConnectingWalletState {
|
|
|
11
10
|
status: ConnectingWalletStatus;
|
|
12
11
|
}
|
|
13
12
|
interface WalletState {
|
|
14
|
-
connectedWalletsByChainType: {
|
|
15
|
-
|
|
16
|
-
|
|
13
|
+
connectedWalletsByChainType: Record<ChainType, {
|
|
14
|
+
wallet: Wallet | undefined;
|
|
15
|
+
address: string | undefined;
|
|
16
|
+
}>;
|
|
17
17
|
connectingWalletState: ConnectingWalletState;
|
|
18
18
|
}
|
|
19
19
|
export declare const useWalletStore: import("zustand").UseBoundStore<import("zustand").StoreApi<WalletState & {
|
|
20
|
-
setConnectedWallet:
|
|
20
|
+
setConnectedWallet: (wallet: Wallet | undefined, address: string | undefined, chainType: ChainType | undefined) => void;
|
|
21
21
|
setConnectingWallet: (state: ConnectingWalletState) => void;
|
|
22
22
|
disconnectWallet: (chainType: ChainType) => void;
|
|
23
23
|
}>>;
|
|
@@ -7,11 +7,12 @@ export var ConnectingWalletStatus;
|
|
|
7
7
|
ConnectingWalletStatus[ConnectingWalletStatus["REJECTED"] = 2] = "REJECTED";
|
|
8
8
|
})(ConnectingWalletStatus || (ConnectingWalletStatus = {}));
|
|
9
9
|
const initialWalletState = {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
[
|
|
14
|
-
|
|
10
|
+
connectedWalletsByChainType: {
|
|
11
|
+
[ChainType.EVM]: { wallet: undefined, address: undefined },
|
|
12
|
+
[ChainType.COSMOS]: { wallet: undefined, address: undefined },
|
|
13
|
+
[ChainType.BTC]: { wallet: undefined, address: undefined },
|
|
14
|
+
[ChainType.SOLANA]: { wallet: undefined, address: undefined },
|
|
15
|
+
},
|
|
15
16
|
connectingWalletState: {
|
|
16
17
|
wallet: undefined,
|
|
17
18
|
status: ConnectingWalletStatus.IDLE,
|
|
@@ -19,13 +20,19 @@ const initialWalletState = {
|
|
|
19
20
|
};
|
|
20
21
|
export const useWalletStore = create((set) => ({
|
|
21
22
|
...initialWalletState,
|
|
22
|
-
setConnectedWallet: (
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
setConnectedWallet: (wallet, address, chainType) => set((state) => {
|
|
24
|
+
if (!wallet)
|
|
25
|
+
return state;
|
|
26
|
+
const ecosystem = chainType ?? (wallet.isMultiChain ? undefined : wallet.type);
|
|
27
|
+
if (ecosystem) {
|
|
28
|
+
return {
|
|
29
|
+
connectedWalletsByChainType: {
|
|
30
|
+
...state.connectedWalletsByChainType,
|
|
31
|
+
[ecosystem]: { wallet, address },
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
return state;
|
|
29
36
|
}),
|
|
30
37
|
setConnectingWallet: (state) => set({ connectingWalletState: state }),
|
|
31
38
|
disconnectWallet: (chainType) => set((state) => {
|
|
@@ -34,7 +41,7 @@ export const useWalletStore = create((set) => ({
|
|
|
34
41
|
return {
|
|
35
42
|
connectedWalletsByChainType: {
|
|
36
43
|
...state.connectedWalletsByChainType,
|
|
37
|
-
[chainType]: {},
|
|
44
|
+
[chainType]: { wallet: null, address: null },
|
|
38
45
|
},
|
|
39
46
|
};
|
|
40
47
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"useWalletStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useWalletStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAGjC,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AAeD,MAAM,kBAAkB,GAAgB;IACtC,2BAA2B,EAAE;QAC3B,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;QAC1D,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;QAC7D,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;QAC1D,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE;KAC9D;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAUlC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACV,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,CACjD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,CAAC,MAAM;YAAE,OAAO,KAAK,CAAC;QAC1B,MAAM,SAAS,GACb,SAAS,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,SAAS,EAAE;YACb,OAAO;gBACL,2BAA2B,EAAE;oBAC3B,GAAG,KAAK,CAAC,2BAA2B;oBACpC,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE;iBACjC;aACF,CAAC;SACH;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;IACJ,mBAAmB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC;IACrE,gBAAgB,EAAE,CAAC,SAAS,EAAE,EAAE,CAC9B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,IAAI,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC;YAAE,OAAO,KAAK,CAAC;QAEhE,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;aAC7C;SACF,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { useQueryClient } from "@tanstack/react-query";
|
|
3
3
|
import { useCallback, useEffect, useMemo } from "react";
|
|
4
|
+
import { useSquidChains } from "../../hooks/chains/useSquidChains";
|
|
5
|
+
import { useConfigStore, useSwapRoutePersistStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
6
|
+
import { useSquidTokens } from "../../hooks/tokens/useSquidTokens";
|
|
4
7
|
import { areSameAddress, formatHash } from "../../services";
|
|
5
|
-
import { useSquidChains } from "../chains/useSquidChains";
|
|
6
|
-
import { useConfigStore, useSwapRoutePersistStore, useTransactionStore, } from "../store/useSquidStore";
|
|
7
|
-
import { useSquidTokens } from "../tokens/useSquidTokens";
|
|
8
8
|
import { getNewSwapParamsFromInput } from "../../services";
|
|
9
9
|
import { filterTokensForDestination, getFirstAvailableChainId, getInitialChainIdFromConfig, getInitialOrDefaultTokenAddressForChain, getTokensForChain, } from "../../services/internal/configService";
|
|
10
10
|
import { WidgetEvents } from "../../services/internal/eventService";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSwap.js","sourceRoot":"","sources":["../../../src/hooks/swap/useSwap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGxD,OAAO,EAAE,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"useSwap.js","sourceRoot":"","sources":["../../../src/hooks/swap/useSwap.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { ChainType } from "@0xsquid/squid-types";
|
|
|
2
2
|
import BigNumber from "bignumber.js";
|
|
3
3
|
import { useMemo } from "react";
|
|
4
4
|
import { useWallet } from "../wallet/useWallet";
|
|
5
|
-
import { useAllTokensWithBalanceForChainType
|
|
5
|
+
import { useAllTokensWithBalanceForChainType } from "./useAllTokensWithBalanceForChainType";
|
|
6
6
|
const BALANCE_STALE_TIME = 60000; // 1 minute
|
|
7
7
|
const BALANCE_CACHE_TIME = 300000; // 5 minutes
|
|
8
8
|
export const useAllConnectedWalletBalances = ({ direction, queryOptions = {
|
|
@@ -48,28 +48,17 @@ export const useAllConnectedWalletBalances = ({ direction, queryOptions = {
|
|
|
48
48
|
enabled: Boolean(connectedAddresses?.[ChainType.SOLANA]),
|
|
49
49
|
},
|
|
50
50
|
});
|
|
51
|
-
const suiBalancesQuery = useAllTokensWithBalanceForChainType({
|
|
52
|
-
chainType: ChainType.SUI,
|
|
53
|
-
address: connectedAddresses?.[ChainType.SUI],
|
|
54
|
-
direction,
|
|
55
|
-
queryOptions: {
|
|
56
|
-
...queryOptions,
|
|
57
|
-
enabled: Boolean(connectedAddresses?.[ChainType.SUI]),
|
|
58
|
-
},
|
|
59
|
-
});
|
|
60
51
|
// Create a map of chain type to balance query results
|
|
61
52
|
const balanceQueries = useMemo(() => ({
|
|
62
53
|
[ChainType.EVM]: evmBalancesQuery,
|
|
63
54
|
[ChainType.COSMOS]: cosmosBalancesQuery,
|
|
64
55
|
[ChainType.BTC]: bitcoinBalancesQuery,
|
|
65
56
|
[ChainType.SOLANA]: solanaBalancesQuery,
|
|
66
|
-
[ChainType.SUI]: suiBalancesQuery,
|
|
67
57
|
}), [
|
|
68
58
|
evmBalancesQuery,
|
|
69
59
|
cosmosBalancesQuery,
|
|
70
60
|
bitcoinBalancesQuery,
|
|
71
61
|
solanaBalancesQuery,
|
|
72
|
-
suiBalancesQuery,
|
|
73
62
|
]);
|
|
74
63
|
// Combine all tokens from different chains
|
|
75
64
|
const allTokens = useMemo(() => Object.values(balanceQueries).flatMap((query) => query.data?.tokens ?? []), [balanceQueries]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,SAAS,MAAM,cAAc,CAAC;AACrC,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { UseQueryOptions, UseQueryResult } from "@tanstack/react-query";
|
|
3
3
|
import { TokenWithBalance } from "../../core/types/tokens";
|
|
4
|
-
|
|
4
|
+
type QueryData = {
|
|
5
5
|
tokens: TokenWithBalance[];
|
|
6
6
|
totalUsdBalance: string;
|
|
7
|
-
}
|
|
7
|
+
};
|
|
8
8
|
export declare const useAllTokensWithBalanceForChainType: ({ chainType, address, direction, queryOptions, }: {
|
|
9
9
|
chainType?: ChainType | undefined;
|
|
10
10
|
address?: string | undefined;
|
|
11
11
|
direction?: "from" | "to" | undefined;
|
|
12
|
-
queryOptions?: UseQueryOptions<
|
|
13
|
-
}) => UseQueryResult<
|
|
12
|
+
queryOptions?: UseQueryOptions<QueryData, unknown, QueryData, import("@tanstack/react-query").QueryKey> | undefined;
|
|
13
|
+
}) => UseQueryResult<QueryData>;
|
|
14
|
+
export {};
|
|
@@ -4,12 +4,12 @@ import { useMemo } from "react";
|
|
|
4
4
|
import { useCosmosContext } from "../../core";
|
|
5
5
|
import { keys } from "../../core/queries/queries-keys";
|
|
6
6
|
import { calculateTotalUsdBalanceUSD, getAllKeysForSupportedCosmosChains, } from "../../services";
|
|
7
|
-
import { getAllBitcoinTokensBalance,
|
|
7
|
+
import { getAllBitcoinTokensBalance, getAllCosmosBalancesForAddress, getAllEvmTokensBalance, getAllSolanaTokensBalance, } from "../../services/external/rpcService";
|
|
8
8
|
import { useSquidChains } from "../chains/useSquidChains";
|
|
9
9
|
import { useSquidTokens } from "./useSquidTokens";
|
|
10
10
|
export const useAllTokensWithBalanceForChainType = ({ chainType, address, direction, queryOptions, }) => {
|
|
11
|
-
const { cosmosChains,
|
|
12
|
-
const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens
|
|
11
|
+
const { cosmosChains, chains } = useSquidChains(direction);
|
|
12
|
+
const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens } = useSquidTokens(direction);
|
|
13
13
|
const { keplrTypeWallet } = useCosmosContext();
|
|
14
14
|
const placeholderData = useMemo(() => {
|
|
15
15
|
const tokens = {
|
|
@@ -17,12 +17,10 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
17
17
|
[ChainType.COSMOS]: cosmosTokens.map((t) => ({ ...t, balance: "0" })),
|
|
18
18
|
[ChainType.SOLANA]: solanaTokens.map((t) => ({ ...t, balance: "0" })),
|
|
19
19
|
[ChainType.BTC]: bitcoinTokens.map((t) => ({ ...t, balance: "0" })),
|
|
20
|
-
[ChainType.SUI]: suiTokens.map((t) => ({ ...t, balance: "0" })),
|
|
21
20
|
};
|
|
22
21
|
if (!chainType) {
|
|
23
|
-
// Return all tokens with zero balance
|
|
24
22
|
return {
|
|
25
|
-
tokens:
|
|
23
|
+
tokens: [...tokens[ChainType.EVM], ...tokens[ChainType.COSMOS]],
|
|
26
24
|
totalUsdBalance: "0",
|
|
27
25
|
};
|
|
28
26
|
}
|
|
@@ -30,41 +28,33 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
30
28
|
tokens: tokens[chainType],
|
|
31
29
|
totalUsdBalance: "0",
|
|
32
30
|
};
|
|
33
|
-
}, [
|
|
34
|
-
chainType,
|
|
35
|
-
evmTokens,
|
|
36
|
-
cosmosTokens,
|
|
37
|
-
solanaTokens,
|
|
38
|
-
bitcoinTokens,
|
|
39
|
-
suiTokens,
|
|
40
|
-
]);
|
|
31
|
+
}, [evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, chainType]);
|
|
41
32
|
const isQueryEnabled = useMemo(() => {
|
|
42
33
|
// Respect the queryOptions.enabled override if provided
|
|
43
34
|
if (queryOptions?.enabled === false)
|
|
44
35
|
return false;
|
|
45
|
-
if (!chainType || !address)
|
|
46
|
-
return false;
|
|
47
36
|
switch (chainType) {
|
|
48
37
|
case ChainType.EVM:
|
|
49
|
-
return evmTokens.length > 0;
|
|
38
|
+
return evmTokens.length > 0 && !!address;
|
|
50
39
|
case ChainType.COSMOS:
|
|
51
|
-
return cosmosTokens.length > 0;
|
|
40
|
+
return cosmosTokens.length > 0 && !!address;
|
|
52
41
|
case ChainType.SOLANA:
|
|
53
|
-
return solanaTokens.length > 0;
|
|
42
|
+
return solanaTokens.length > 0 && !!address;
|
|
54
43
|
case ChainType.BTC:
|
|
55
|
-
return bitcoinTokens.length > 0;
|
|
56
|
-
case
|
|
57
|
-
return
|
|
44
|
+
return bitcoinTokens.length > 0 && !!address;
|
|
45
|
+
case undefined:
|
|
46
|
+
return false;
|
|
47
|
+
default:
|
|
48
|
+
return true;
|
|
58
49
|
}
|
|
59
50
|
}, [
|
|
60
51
|
chainType,
|
|
61
|
-
address,
|
|
62
|
-
queryOptions?.enabled,
|
|
63
52
|
evmTokens.length,
|
|
64
53
|
cosmosTokens.length,
|
|
65
54
|
solanaTokens.length,
|
|
66
55
|
bitcoinTokens.length,
|
|
67
|
-
|
|
56
|
+
address,
|
|
57
|
+
queryOptions?.enabled,
|
|
68
58
|
]);
|
|
69
59
|
const query = useQuery(keys().allTokensBalance(address, chainType), async () => {
|
|
70
60
|
// Return zero balances if no address
|
|
@@ -83,21 +73,18 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
83
73
|
break;
|
|
84
74
|
case ChainType.COSMOS:
|
|
85
75
|
const addresses = await getAllKeysForSupportedCosmosChains(cosmosChains.map((c) => c.chainId), keplrTypeWallet);
|
|
86
|
-
fetchedTokens = await
|
|
76
|
+
fetchedTokens = await getAllCosmosBalancesForAddress({
|
|
87
77
|
addresses,
|
|
88
78
|
cosmosChains,
|
|
89
79
|
cosmosTokens,
|
|
90
80
|
});
|
|
91
81
|
break;
|
|
92
82
|
case ChainType.SOLANA:
|
|
93
|
-
fetchedTokens = await getAllSolanaTokensBalance(solanaTokens, address);
|
|
83
|
+
fetchedTokens = await getAllSolanaTokensBalance(solanaTokens, address, chains);
|
|
94
84
|
break;
|
|
95
85
|
case ChainType.BTC:
|
|
96
86
|
fetchedTokens = await getAllBitcoinTokensBalance(address, bitcoinTokens);
|
|
97
87
|
break;
|
|
98
|
-
case ChainType.SUI:
|
|
99
|
-
fetchedTokens = await getAllSuiTokensBalance(address, suiTokens, suiChains);
|
|
100
|
-
break;
|
|
101
88
|
default:
|
|
102
89
|
fetchedTokens = placeholderData.tokens;
|
|
103
90
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAllTokensWithBalanceForChainType.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllTokensWithBalanceForChainType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAGL,QAAQ,GACT,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EACL,2BAA2B,EAC3B,kCAAkC,GACnC,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,
|
|
1
|
+
{"version":3,"file":"useAllTokensWithBalanceForChainType.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllTokensWithBalanceForChainType.ts"],"names":[],"mappings":"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"}
|