@0xsquid/react-hooks 7.1.1-wallets-refactor-beta.0 → 7.1.1-wallets-refactor-beta.1
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/client/index.d.ts +2 -0
- package/dist/core/client/index.js +3 -0
- package/dist/core/client/index.js.map +1 -1
- package/dist/core/connectors/xrpl/CrossMark.d.ts +13 -0
- package/dist/core/connectors/xrpl/CrossMark.js +76 -0
- package/dist/core/connectors/xrpl/CrossMark.js.map +1 -0
- package/dist/core/connectors/xrpl/Xaman.d.ts +16 -0
- package/dist/core/connectors/xrpl/Xaman.js +80 -0
- package/dist/core/connectors/xrpl/Xaman.js.map +1 -0
- package/dist/core/connectors/xrpl/XamanQr.d.ts +15 -0
- package/dist/core/connectors/xrpl/XamanQr.js +78 -0
- package/dist/core/connectors/xrpl/XamanQr.js.map +1 -0
- package/dist/core/connectors/xrpl/XrplMetamaskSnap.d.ts +35 -0
- package/dist/core/connectors/xrpl/XrplMetamaskSnap.js +176 -0
- package/dist/core/connectors/xrpl/XrplMetamaskSnap.js.map +1 -0
- package/dist/core/constants.d.ts +8 -5
- package/dist/core/constants.js +14 -5
- package/dist/core/constants.js.map +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/multicall3.d.ts +5 -1
- package/dist/core/multicall3.js +21 -1
- package/dist/core/multicall3.js.map +1 -1
- package/dist/core/providers/XrplProvider.d.ts +17 -0
- package/dist/core/providers/XrplProvider.js +15 -0
- package/dist/core/providers/XrplProvider.js.map +1 -0
- package/dist/core/queries/queries-keys.d.ts +9 -1
- package/dist/core/queries/queries-keys.js +33 -0
- package/dist/core/queries/queries-keys.js.map +1 -1
- package/dist/core/types/event.d.ts +7 -0
- package/dist/core/types/index.d.ts +2 -1
- package/dist/core/types/index.js +2 -1
- package/dist/core/types/index.js.map +1 -1
- package/dist/core/types/wallet.d.ts +39 -17
- package/dist/core/types/wallet.js +4 -0
- package/dist/core/types/wallet.js.map +1 -1
- package/dist/core/types/xrpl.d.ts +70 -0
- package/dist/core/types/xrpl.js +20 -0
- package/dist/core/types/xrpl.js.map +1 -0
- package/dist/core/wallets.js +48 -3
- package/dist/core/wallets.js.map +1 -1
- package/dist/hooks/evm/useEvm.js +26 -4
- package/dist/hooks/evm/useEvm.js.map +1 -1
- package/dist/hooks/evm/useEvmWallets.d.ts +0 -3
- package/dist/hooks/evm/useEvmWallets.js +0 -3
- package/dist/hooks/evm/useEvmWallets.js.map +1 -1
- package/dist/hooks/index.d.ts +2 -0
- package/dist/hooks/index.js +2 -0
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/solana/useSolana.js +2 -3
- package/dist/hooks/solana/useSolana.js.map +1 -1
- package/dist/hooks/store/useAddressBookStore.d.ts +1 -1
- package/dist/hooks/store/useAddressBookStore.js +6 -2
- package/dist/hooks/store/useAddressBookStore.js.map +1 -1
- package/dist/hooks/store/useWalletStore.d.ts +22 -3
- package/dist/hooks/store/useWalletStore.js +18 -4
- package/dist/hooks/store/useWalletStore.js.map +1 -1
- package/dist/hooks/sui/useSui.js +2 -3
- package/dist/hooks/sui/useSui.js.map +1 -1
- package/dist/hooks/tokens/useAllConnectedWalletBalances.js +11 -0
- package/dist/hooks/tokens/useAllConnectedWalletBalances.js.map +1 -1
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js +13 -2
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js.map +1 -1
- package/dist/hooks/tokens/useBalance.d.ts +1 -0
- package/dist/hooks/tokens/useBalance.js +22 -1
- package/dist/hooks/tokens/useBalance.js.map +1 -1
- package/dist/hooks/tokens/useMultiChainBalance.js +10 -1
- package/dist/hooks/tokens/useMultiChainBalance.js.map +1 -1
- package/dist/hooks/tokens/useNativeBalance.d.ts +1 -0
- package/dist/hooks/tokens/useNativeBalance.js +33 -1
- package/dist/hooks/tokens/useNativeBalance.js.map +1 -1
- package/dist/hooks/tokens/useNativeTokenForChain.js +3 -1
- package/dist/hooks/tokens/useNativeTokenForChain.js.map +1 -1
- package/dist/hooks/tokens/useSquidTokens.d.ts +1 -0
- package/dist/hooks/tokens/useSquidTokens.js +6 -1
- package/dist/hooks/tokens/useSquidTokens.js.map +1 -1
- package/dist/hooks/transaction/send/useSendTransaction.d.ts +1 -1
- package/dist/hooks/transaction/send/useSendTransaction.js +28 -3
- package/dist/hooks/transaction/send/useSendTransaction.js.map +1 -1
- package/dist/hooks/transaction/useAllTransactionsStatus.js +7 -0
- package/dist/hooks/transaction/useAllTransactionsStatus.js.map +1 -1
- package/dist/hooks/transaction/useExecuteTransaction.d.ts +1 -0
- package/dist/hooks/transaction/useExecuteTransaction.js +60 -6
- package/dist/hooks/transaction/useExecuteTransaction.js.map +1 -1
- package/dist/hooks/transaction/useSendTransactionStatus.js +14 -4
- package/dist/hooks/transaction/useSendTransactionStatus.js.map +1 -1
- package/dist/hooks/wallet/useAutoConnect.js +1 -4
- package/dist/hooks/wallet/useAutoConnect.js.map +1 -1
- package/dist/hooks/wallet/useMultiChainWallet.d.ts +241 -0
- package/dist/hooks/wallet/useMultiChainWallet.js +16 -0
- package/dist/hooks/wallet/useMultiChainWallet.js.map +1 -1
- package/dist/hooks/wallet/useSigner.d.ts +1 -0
- package/dist/hooks/wallet/useSigner.js +7 -0
- package/dist/hooks/wallet/useSigner.js.map +1 -1
- package/dist/hooks/wallet/useWallet.d.ts +251 -6
- package/dist/hooks/wallet/useWallet.js +40 -3
- package/dist/hooks/wallet/useWallet.js.map +1 -1
- package/dist/hooks/wallet/useWallets.js +4 -1
- package/dist/hooks/wallet/useWallets.js.map +1 -1
- package/dist/hooks/xrpl/useXrpl.d.ts +2 -0
- package/dist/hooks/xrpl/useXrpl.js +21 -0
- package/dist/hooks/xrpl/useXrpl.js.map +1 -0
- package/dist/hooks/xrpl/useXrplTrustLine.d.ts +17 -0
- package/dist/hooks/xrpl/useXrplTrustLine.js +137 -0
- package/dist/hooks/xrpl/useXrplTrustLine.js.map +1 -0
- package/dist/hooks/xrpl/useXrplWallets.d.ts +43 -0
- package/dist/hooks/xrpl/useXrplWallets.js +46 -0
- package/dist/hooks/xrpl/useXrplWallets.js.map +1 -0
- package/dist/provider/index.js +7 -5
- package/dist/provider/index.js.map +1 -1
- package/dist/services/external/rpcService.d.ts +2 -0
- package/dist/services/external/rpcService.js +30 -4
- package/dist/services/external/rpcService.js.map +1 -1
- package/dist/services/external/websocket.d.ts +6 -0
- package/dist/services/external/websocket.js +34 -0
- package/dist/services/external/websocket.js.map +1 -0
- package/dist/services/external/xaman.d.ts +30 -0
- package/dist/services/external/xaman.js +46 -0
- package/dist/services/external/xaman.js.map +1 -0
- package/dist/services/external/xrplRpcClient.d.ts +39 -0
- package/dist/services/external/xrplRpcClient.js +167 -0
- package/dist/services/external/xrplRpcClient.js.map +1 -0
- package/dist/services/index.d.ts +1 -0
- package/dist/services/index.js +1 -0
- package/dist/services/index.js.map +1 -1
- package/dist/services/internal/errorService.js +1 -1
- package/dist/services/internal/errorService.js.map +1 -1
- package/dist/services/internal/eventService.d.ts +15 -0
- package/dist/services/internal/eventService.js +21 -0
- package/dist/services/internal/eventService.js.map +1 -1
- package/dist/services/internal/evmService.js +14 -7
- package/dist/services/internal/evmService.js.map +1 -1
- package/dist/services/internal/sendTransaction.d.ts +6 -0
- package/dist/services/internal/sendTransaction.js +46 -1
- package/dist/services/internal/sendTransaction.js.map +1 -1
- package/dist/services/internal/sendTransactionStatus.js +16 -0
- package/dist/services/internal/sendTransactionStatus.js.map +1 -1
- package/dist/services/internal/solanaService.js +5 -2
- package/dist/services/internal/solanaService.js.map +1 -1
- package/dist/services/internal/transactionService.js +4 -2
- package/dist/services/internal/transactionService.js.map +1 -1
- package/dist/services/internal/transactionStatusService.js +2 -1
- package/dist/services/internal/transactionStatusService.js.map +1 -1
- package/dist/services/internal/walletService.d.ts +9 -7
- package/dist/services/internal/walletService.js +31 -25
- package/dist/services/internal/walletService.js.map +1 -1
- package/dist/services/internal/walletStandardService.d.ts +7 -0
- package/dist/services/internal/walletStandardService.js +7 -0
- package/dist/services/internal/walletStandardService.js.map +1 -1
- package/dist/services/internal/xrplService.d.ts +17 -0
- package/dist/services/internal/xrplService.js +52 -0
- package/dist/services/internal/xrplService.js.map +1 -0
- package/dist/tests/walletService.test.js +14 -14
- package/dist/tests/walletService.test.js.map +1 -1
- package/package.json +4 -2
- package/dist/hooks/bitcoin/useBitcoinWallets.d.ts +0 -4
- package/dist/hooks/bitcoin/useBitcoinWallets.js +0 -10
- package/dist/hooks/bitcoin/useBitcoinWallets.js.map +0 -1
package/dist/core/wallets.js
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
|
-
// import { coinbaseWallet, metaMask, walletConnect } from "wagmi/connectors";
|
|
3
2
|
import { accessProperty } from "../services/internal/walletService";
|
|
4
3
|
import { KeplrConnector, PhantomConnector, UnisatConnector, } from "./connectors/bitcoin";
|
|
5
|
-
import {
|
|
4
|
+
import { CrossmarkConnector } from "./connectors/xrpl/CrossMark";
|
|
5
|
+
import { XrplMetamaskSnapConnector } from "./connectors/xrpl/XrplMetamaskSnap";
|
|
6
|
+
import { WindowWalletFlag, } from "./types/wallet";
|
|
6
7
|
export const walletIconBaseUrl = "https://raw.githubusercontent.com/0xsquid/assets/main/images/webp128/wallets";
|
|
7
8
|
const bitcoinWallets = [
|
|
8
9
|
{
|
|
@@ -17,6 +18,31 @@ const bitcoinWallets = [
|
|
|
17
18
|
connector: new UnisatConnector(),
|
|
18
19
|
},
|
|
19
20
|
];
|
|
21
|
+
const xrplWallets = [
|
|
22
|
+
{
|
|
23
|
+
type: ChainType.XRPL,
|
|
24
|
+
name: "XRPL Metamask Snap",
|
|
25
|
+
isInstalled() {
|
|
26
|
+
// we need to check if the snap is installed
|
|
27
|
+
return false;
|
|
28
|
+
},
|
|
29
|
+
skipInstallCheck: true,
|
|
30
|
+
connector: new XrplMetamaskSnapConnector(),
|
|
31
|
+
connectorId: "xrpl-metamask-snap",
|
|
32
|
+
connectorName: "XRPL Metamask Snap",
|
|
33
|
+
windowFlag: WindowWalletFlag.XrpLedgerMetamaskSnap,
|
|
34
|
+
icon: `${walletIconBaseUrl}/metamask-xrpl-snap.webp`,
|
|
35
|
+
},
|
|
36
|
+
{
|
|
37
|
+
type: ChainType.XRPL,
|
|
38
|
+
name: "Crossmark",
|
|
39
|
+
windowFlag: WindowWalletFlag.Crossmark,
|
|
40
|
+
connector: new CrossmarkConnector(),
|
|
41
|
+
connectorId: "crossmark",
|
|
42
|
+
connectorName: "Crossmark",
|
|
43
|
+
icon: `${walletIconBaseUrl}/crossmark.webp`,
|
|
44
|
+
},
|
|
45
|
+
];
|
|
20
46
|
export const multiChainWallets = [
|
|
21
47
|
{
|
|
22
48
|
isMultiChain: true,
|
|
@@ -118,7 +144,10 @@ export const multiChainWallets = [
|
|
|
118
144
|
],
|
|
119
145
|
},
|
|
120
146
|
];
|
|
121
|
-
export const singleChainWallets =
|
|
147
|
+
export const singleChainWallets = [
|
|
148
|
+
...bitcoinWallets,
|
|
149
|
+
...xrplWallets,
|
|
150
|
+
];
|
|
122
151
|
export const walletStoreLinks = {
|
|
123
152
|
leap: {
|
|
124
153
|
chrome: "https://chrome.google.com/webstore/detail/leap-cosmos-wallet/fcfcfllfndlomdhbehjjcoimbgofdncg",
|
|
@@ -204,6 +233,22 @@ export const walletStoreLinks = {
|
|
|
204
233
|
chrome: "https://chromewebstore.google.com/detail/backpack/aflkmfhebedbjioipglgcbcmnbpgliof",
|
|
205
234
|
firefox: "",
|
|
206
235
|
},
|
|
236
|
+
"xrpl-metamask-snap": {
|
|
237
|
+
chrome: "https://snaps.metamask.io/snap/npm/xrpl-snap/",
|
|
238
|
+
firefox: "https://snaps.metamask.io/snap/npm/xrpl-snap/",
|
|
239
|
+
},
|
|
240
|
+
crossmark: {
|
|
241
|
+
chrome: "https://chromewebstore.google.com/detail/crossmark-wallet/canipghmckojpianfgiklhbgpfmhjkjg",
|
|
242
|
+
firefox: "",
|
|
243
|
+
},
|
|
244
|
+
"xaman-qr": {
|
|
245
|
+
chrome: "",
|
|
246
|
+
firefox: "",
|
|
247
|
+
},
|
|
248
|
+
"xaman-xapp": {
|
|
249
|
+
chrome: "",
|
|
250
|
+
firefox: "",
|
|
251
|
+
},
|
|
207
252
|
brave: {
|
|
208
253
|
chrome: "",
|
|
209
254
|
firefox: "",
|
package/dist/core/wallets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../src/core/wallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,
|
|
1
|
+
{"version":3,"file":"wallets.js","sourceRoot":"","sources":["../../src/core/wallets.ts"],"names":[],"mappings":"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"}
|
package/dist/hooks/evm/useEvm.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { useMutation } from "@tanstack/react-query";
|
|
3
3
|
import { useCallback, useEffect } from "react";
|
|
4
|
-
import { useAccount, useConnect, useDisconnect
|
|
4
|
+
import { useAccount, useConnect, useDisconnect } from "wagmi";
|
|
5
5
|
import { useWalletStore } from "../store/useWalletStore";
|
|
6
6
|
import { useEvmWallets } from "./useEvmWallets";
|
|
7
7
|
export function useEvm() {
|
|
@@ -10,9 +10,9 @@ export function useEvm() {
|
|
|
10
10
|
const { connectAsync } = useConnect();
|
|
11
11
|
const { disconnect } = useDisconnect();
|
|
12
12
|
const { address, connector } = useAccount();
|
|
13
|
-
const { reconnectAsync } = useReconnect();
|
|
14
13
|
const { wallets } = useEvmWallets();
|
|
15
14
|
const connectedEvmWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.EVM]);
|
|
15
|
+
const recentEvmWalletId = useWalletStore((store) => store.recentConnectorIds[ChainType.EVM]);
|
|
16
16
|
const connectEvm = useMutation(async ({ wallet, }) => {
|
|
17
17
|
const result = await connectAsync({
|
|
18
18
|
connector: wallet.connector,
|
|
@@ -27,8 +27,30 @@ export function useEvm() {
|
|
|
27
27
|
disconnect({ connector: connectedEvmWallet.wallet?.connector });
|
|
28
28
|
}, [connectedEvmWallet.wallet?.connector, disconnect]);
|
|
29
29
|
const autoConnectEvm = useCallback(async () => {
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
const recentEvmWallet = wallets.find((w) => w.connectorId === recentEvmWalletId);
|
|
31
|
+
if (!recentEvmWallet) {
|
|
32
|
+
return;
|
|
33
|
+
}
|
|
34
|
+
const isAuthorized = await recentEvmWallet.connector.isAuthorized();
|
|
35
|
+
if (!isAuthorized)
|
|
36
|
+
return;
|
|
37
|
+
const data = await recentEvmWallet.connector
|
|
38
|
+
.connect({ isReconnecting: true })
|
|
39
|
+
.catch(() => null);
|
|
40
|
+
if (!data)
|
|
41
|
+
return;
|
|
42
|
+
const [firstAddress] = data.accounts;
|
|
43
|
+
setConnectedWallet(ChainType.EVM, {
|
|
44
|
+
wallet: recentEvmWallet,
|
|
45
|
+
address: firstAddress,
|
|
46
|
+
});
|
|
47
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
48
|
+
}, [
|
|
49
|
+
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
50
|
+
wallets.map((w) => w.connectorId),
|
|
51
|
+
recentEvmWalletId,
|
|
52
|
+
setConnectedWallet,
|
|
53
|
+
]);
|
|
32
54
|
useEffect(() => {
|
|
33
55
|
if (!connector?.id || !address) {
|
|
34
56
|
disconnectWallet(ChainType.EVM);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useEvm.js","sourceRoot":"","sources":["../../../src/hooks/evm/useEvm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"useEvm.js","sourceRoot":"","sources":["../../../src/hooks/evm/useEvm.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
import { useMemo } from "react";
|
|
2
2
|
import { useConnectors } from "wagmi";
|
|
3
3
|
import { filterWagmiConnector, formatEvmWallet, } from "../../services/internal/evmService";
|
|
4
|
-
/**
|
|
5
|
-
* Returns the list of registered EVM wallets
|
|
6
|
-
*/
|
|
7
4
|
export function useEvmWallets() {
|
|
8
5
|
const connectors = useConnectors();
|
|
9
6
|
const wallets = useMemo(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useEvmWallets.js","sourceRoot":"","sources":["../../../src/hooks/evm/useEvmWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EACL,oBAAoB,EACpB,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAE5C
|
|
1
|
+
{"version":3,"file":"useEvmWallets.js","sourceRoot":"","sources":["../../../src/hooks/evm/useEvmWallets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAEtC,OAAO,EACL,oBAAoB,EACpB,eAAe,GAChB,MAAM,oCAAoC,CAAC;AAE5C,MAAM,UAAU,aAAa;IAG3B,MAAM,UAAU,GAAG,aAAa,EAAE,CAAC;IAEnC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE;QAC3B,OAAO,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACtE,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAEjB,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC"}
|
package/dist/hooks/index.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export { useFavoriteTokensStore, type FavoriteToken, } from "./store/useFavorite
|
|
|
12
12
|
export { useHistoryStore } from "./store/useHistoryStore";
|
|
13
13
|
export { useSendTransactionStore } from "./store/useSendTransactionStore";
|
|
14
14
|
export { useConfigStore, useSquidStore, useSwapRoutePersistStore, useTransactionStore, } from "./store/useSquidStore";
|
|
15
|
+
export { ConnectingWalletStatus } from "./store/useWalletStore";
|
|
15
16
|
export { useDepositAddress } from "./swap/useDepositAddress";
|
|
16
17
|
export { useSwap } from "./swap/useSwap";
|
|
17
18
|
export { useAllConnectedWalletBalances } from "./tokens/useAllConnectedWalletBalances";
|
|
@@ -49,3 +50,4 @@ export { useMultiChainWallet } from "./wallet/useMultiChainWallet";
|
|
|
49
50
|
export { useSigner } from "./wallet/useSigner";
|
|
50
51
|
export { useWallet } from "./wallet/useWallet";
|
|
51
52
|
export { useWallets } from "./wallet/useWallets";
|
|
53
|
+
export { useXrplTrustLine } from "./xrpl/useXrplTrustLine";
|
package/dist/hooks/index.js
CHANGED
|
@@ -12,6 +12,7 @@ export { useFavoriteTokensStore, } from "./store/useFavoriteTokensStore";
|
|
|
12
12
|
export { useHistoryStore } from "./store/useHistoryStore";
|
|
13
13
|
export { useSendTransactionStore } from "./store/useSendTransactionStore";
|
|
14
14
|
export { useConfigStore, useSquidStore, useSwapRoutePersistStore, useTransactionStore, } from "./store/useSquidStore";
|
|
15
|
+
export { ConnectingWalletStatus } from "./store/useWalletStore";
|
|
15
16
|
export { useDepositAddress } from "./swap/useDepositAddress";
|
|
16
17
|
export { useSwap } from "./swap/useSwap";
|
|
17
18
|
export { useAllConnectedWalletBalances } from "./tokens/useAllConnectedWalletBalances";
|
|
@@ -49,4 +50,5 @@ export { useMultiChainWallet } from "./wallet/useMultiChainWallet";
|
|
|
49
50
|
export { useSigner } from "./wallet/useSigner";
|
|
50
51
|
export { useWallet } from "./wallet/useWallet";
|
|
51
52
|
export { useWallets } from "./wallet/useWallets";
|
|
53
|
+
export { useXrplTrustLine } from "./xrpl/useXrplTrustLine";
|
|
52
54
|
//# 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":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,6 @@ import { Connection } from "@solana/web3.js";
|
|
|
3
3
|
import { useMutation } from "@tanstack/react-query";
|
|
4
4
|
import { useCallback, useEffect, useRef } from "react";
|
|
5
5
|
import { SOLANA_RPC_URL } from "../../core/constants";
|
|
6
|
-
import { RecentWalletStorage } from "../../services";
|
|
7
6
|
import { useWalletStore } from "../store/useWalletStore";
|
|
8
7
|
import { useSolanaWallets } from "./useSolanaWallets";
|
|
9
8
|
export function useSolana() {
|
|
@@ -11,6 +10,7 @@ export function useSolana() {
|
|
|
11
10
|
const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
|
|
12
11
|
const { wallets } = useSolanaWallets();
|
|
13
12
|
const connectedSolanaWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SOLANA]);
|
|
13
|
+
const recentSolanaWalletId = useWalletStore((store) => store.recentConnectorIds[ChainType.SOLANA]);
|
|
14
14
|
const connectSolana = useMutation(async ({ wallet, }) => {
|
|
15
15
|
try {
|
|
16
16
|
// try to connect silently first
|
|
@@ -31,7 +31,6 @@ export function useSolana() {
|
|
|
31
31
|
await connectedSolanaWallet.wallet?.connector.disconnect();
|
|
32
32
|
}, [connectedSolanaWallet.wallet?.connector]);
|
|
33
33
|
const autoConnectSolana = useCallback(async () => {
|
|
34
|
-
const recentSolanaWalletId = RecentWalletStorage.get(ChainType.SOLANA);
|
|
35
34
|
const recentSolanaWallet = wallets.find((w) => w.connectorId === recentSolanaWalletId);
|
|
36
35
|
if (!recentSolanaWallet) {
|
|
37
36
|
return;
|
|
@@ -43,7 +42,7 @@ export function useSolana() {
|
|
|
43
42
|
address: account.address,
|
|
44
43
|
});
|
|
45
44
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
46
|
-
}, [wallets.map((w) => w.connectorId)]);
|
|
45
|
+
}, [wallets.map((w) => w.connectorId), recentSolanaWalletId]);
|
|
47
46
|
useEffect(() => {
|
|
48
47
|
const wallet = connectedSolanaWallet.wallet;
|
|
49
48
|
if (!wallet) {
|
|
@@ -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;AACjD,OAAO,EAAE,UAAU,EAAkB,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useSolana.js","sourceRoot":"","sources":["../../../src/hooks/solana/useSolana.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { AddressWithEns } from "../../core/types/wallet";
|
|
|
2
2
|
interface AddressBookStore {
|
|
3
3
|
addressBook: AddressWithEns[];
|
|
4
4
|
add(addressData: AddressWithEns): void;
|
|
5
|
-
remove(
|
|
5
|
+
remove(addressData: Pick<AddressWithEns, "address" | "chainType">): void;
|
|
6
6
|
}
|
|
7
7
|
export declare const useAddressBookStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<AddressBookStore>, "persist"> & {
|
|
8
8
|
persist: {
|
|
@@ -5,7 +5,10 @@ export const useAddressBookStore = create(persist((set) => ({
|
|
|
5
5
|
addressBook: [],
|
|
6
6
|
add: (newAddressData) => {
|
|
7
7
|
set((state) => {
|
|
8
|
-
const alreadyExists = state.addressBook.some((savedAddress) =>
|
|
8
|
+
const alreadyExists = state.addressBook.some((savedAddress) => {
|
|
9
|
+
return (savedAddress.chainType === newAddressData.chainType &&
|
|
10
|
+
areSameAddress(savedAddress.address, newAddressData.address));
|
|
11
|
+
});
|
|
9
12
|
if (alreadyExists)
|
|
10
13
|
return state;
|
|
11
14
|
return {
|
|
@@ -16,7 +19,8 @@ export const useAddressBookStore = create(persist((set) => ({
|
|
|
16
19
|
remove: (addressToRemove) => {
|
|
17
20
|
set((state) => {
|
|
18
21
|
return {
|
|
19
|
-
addressBook: state.addressBook.filter((savedAddress) =>
|
|
22
|
+
addressBook: state.addressBook.filter((savedAddress) => savedAddress.chainType !== addressToRemove.chainType ||
|
|
23
|
+
!areSameAddress(savedAddress.address, addressToRemove.address)),
|
|
20
24
|
};
|
|
21
25
|
});
|
|
22
26
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAddressBookStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useAddressBookStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CACvC,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,WAAW,EAAE,EAAE;IACf,GAAG,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"useAddressBookStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useAddressBookStore.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAQhD,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CACvC,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,WAAW,EAAE,EAAE;IACf,GAAG,EAAE,CAAC,cAAc,EAAE,EAAE;QACtB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,MAAM,aAAa,GAAG,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,YAAY,EAAE,EAAE;gBAC5D,OAAO,CACL,YAAY,CAAC,SAAS,KAAK,cAAc,CAAC,SAAS;oBACnD,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,cAAc,CAAC,OAAO,CAAC,CAC7D,CAAC;YACJ,CAAC,CAAC,CAAC;YAEH,IAAI,aAAa;gBAAE,OAAO,KAAK,CAAC;YAEhC,OAAO;gBACL,WAAW,EAAE,CAAC,GAAG,KAAK,CAAC,WAAW,EAAE,cAAc,CAAC;aACpD,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IACD,MAAM,EAAE,CAAC,eAAe,EAAE,EAAE;QAC1B,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACZ,OAAO;gBACL,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM,CACnC,CAAC,YAAY,EAAE,EAAE,CACf,YAAY,CAAC,SAAS,KAAK,eAAe,CAAC,SAAS;oBACpD,CAAC,cAAc,CAAC,YAAY,CAAC,OAAO,EAAE,eAAe,CAAC,OAAO,CAAC,CACjE;aACF,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,EACF;IACE,IAAI,EAAE,yBAAyB;CAChC,CACF,CACF,CAAC"}
|
|
@@ -9,16 +9,35 @@ export declare enum ConnectingWalletStatus {
|
|
|
9
9
|
export interface ConnectingWalletState {
|
|
10
10
|
wallet: Wallet | undefined;
|
|
11
11
|
status: ConnectingWalletStatus;
|
|
12
|
+
qrData?: {
|
|
13
|
+
matrix: boolean[][];
|
|
14
|
+
};
|
|
12
15
|
}
|
|
13
|
-
interface
|
|
16
|
+
interface WalletStoreState {
|
|
14
17
|
connectedWalletsByChainType: {
|
|
15
18
|
[K in keyof ChainTypeToWalletState]: Partial<ChainTypeToWalletState[K]>;
|
|
16
19
|
};
|
|
17
20
|
connectingWalletState: ConnectingWalletState;
|
|
21
|
+
recentConnectorIds: Partial<Record<ChainType, string>>;
|
|
18
22
|
}
|
|
19
|
-
|
|
23
|
+
type WalletStoreActions = {
|
|
20
24
|
setConnectedWallet: <T extends ChainType>(chainType: ChainType, state: ChainTypeToWalletState[T]) => void;
|
|
21
25
|
setConnectingWallet: (state: ConnectingWalletState) => void;
|
|
22
26
|
disconnectWallet: (chainType: ChainType) => void;
|
|
23
|
-
}
|
|
27
|
+
};
|
|
28
|
+
export declare const useWalletStore: import("zustand").UseBoundStore<Omit<import("zustand").StoreApi<WalletStoreState & WalletStoreActions>, "persist"> & {
|
|
29
|
+
persist: {
|
|
30
|
+
setOptions: (options: Partial<import("zustand/middleware").PersistOptions<WalletStoreState & WalletStoreActions, {
|
|
31
|
+
recentConnectorIds: Partial<Record<ChainType, string>>;
|
|
32
|
+
}>>) => void;
|
|
33
|
+
clearStorage: () => void;
|
|
34
|
+
rehydrate: () => void | Promise<void>;
|
|
35
|
+
hasHydrated: () => boolean;
|
|
36
|
+
onHydrate: (fn: (state: WalletStoreState & WalletStoreActions) => void) => () => void;
|
|
37
|
+
onFinishHydration: (fn: (state: WalletStoreState & WalletStoreActions) => void) => () => void;
|
|
38
|
+
getOptions: () => Partial<import("zustand/middleware").PersistOptions<WalletStoreState & WalletStoreActions, {
|
|
39
|
+
recentConnectorIds: Partial<Record<ChainType, string>>;
|
|
40
|
+
}>>;
|
|
41
|
+
};
|
|
42
|
+
}>;
|
|
24
43
|
export {};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { create } from "zustand";
|
|
3
|
-
import {
|
|
3
|
+
import { persist } from "zustand/middleware";
|
|
4
|
+
import { isEmptyObject } from "../../services";
|
|
4
5
|
export var ConnectingWalletStatus;
|
|
5
6
|
(function (ConnectingWalletStatus) {
|
|
6
7
|
ConnectingWalletStatus[ConnectingWalletStatus["IDLE"] = 0] = "IDLE";
|
|
@@ -17,16 +18,20 @@ const initialWalletState = {
|
|
|
17
18
|
wallet: undefined,
|
|
18
19
|
status: ConnectingWalletStatus.IDLE,
|
|
19
20
|
},
|
|
21
|
+
recentConnectorIds: {},
|
|
20
22
|
};
|
|
21
|
-
export const useWalletStore = create((set) => ({
|
|
23
|
+
export const useWalletStore = create()(persist((set) => ({
|
|
22
24
|
...initialWalletState,
|
|
23
25
|
setConnectedWallet: (chainType, connectedWalletState) => set((state) => {
|
|
24
|
-
RecentWalletStorage.set(chainType, connectedWalletState.wallet.connectorId);
|
|
25
26
|
return {
|
|
26
27
|
connectedWalletsByChainType: {
|
|
27
28
|
...state.connectedWalletsByChainType,
|
|
28
29
|
[chainType]: connectedWalletState,
|
|
29
30
|
},
|
|
31
|
+
recentConnectorIds: {
|
|
32
|
+
...state.recentConnectorIds,
|
|
33
|
+
[chainType]: connectedWalletState.wallet.connectorId,
|
|
34
|
+
},
|
|
30
35
|
};
|
|
31
36
|
}),
|
|
32
37
|
setConnectingWallet: (state) => set({ connectingWalletState: state }),
|
|
@@ -34,13 +39,22 @@ export const useWalletStore = create((set) => ({
|
|
|
34
39
|
if (isEmptyObject(state.connectedWalletsByChainType[chainType])) {
|
|
35
40
|
return state;
|
|
36
41
|
}
|
|
37
|
-
|
|
42
|
+
const { [chainType]: _, ...recentConnectorIds } = state.recentConnectorIds;
|
|
38
43
|
return {
|
|
39
44
|
connectedWalletsByChainType: {
|
|
40
45
|
...state.connectedWalletsByChainType,
|
|
41
46
|
[chainType]: {},
|
|
42
47
|
},
|
|
48
|
+
recentConnectorIds,
|
|
43
49
|
};
|
|
44
50
|
}),
|
|
51
|
+
}), {
|
|
52
|
+
name: "squid.wallet.store",
|
|
53
|
+
version: 0,
|
|
54
|
+
partialize({ recentConnectorIds }) {
|
|
55
|
+
return {
|
|
56
|
+
recentConnectorIds,
|
|
57
|
+
};
|
|
58
|
+
},
|
|
45
59
|
}));
|
|
46
60
|
//# sourceMappingURL=useWalletStore.js.map
|
|
@@ -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;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAG7C,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,MAAM,CAAN,IAAY,sBAIX;AAJD,WAAY,sBAAsB;IAChC,mEAAI,CAAA;IACJ,+EAAU,CAAA;IACV,2EAAQ,CAAA;AACV,CAAC,EAJW,sBAAsB,KAAtB,sBAAsB,QAIjC;AA2BD,MAAM,kBAAkB,GAAqB;IAC3C,uDAAuD;IACvD,2BAA2B,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAC1D,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC;QACnB,GAAG,GAAG;QACN,CAAC,SAAS,CAAC,EAAE,EAAE;KAChB,CAAC,EACF,EAAqD,CACtD;IACD,qBAAqB,EAAE;QACrB,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,sBAAsB,CAAC,IAAI;KACpC;IACD,kBAAkB,EAAE,EAAE;CACvB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,EAAyC,CAC3E,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,GAAG,kBAAkB;IACrB,kBAAkB,EAAE,CAAC,SAAS,EAAE,oBAAoB,EAAE,EAAE,CACtD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,oBAAoB;aAClC;YACD,kBAAkB,EAAE;gBAClB,GAAG,KAAK,CAAC,kBAAkB;gBAC3B,CAAC,SAAS,CAAC,EAAE,oBAAoB,CAAC,MAAM,CAAC,WAAW;aACrD;SACF,CAAC;IACJ,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,aAAa,CAAC,KAAK,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,EAAE;YAC/D,OAAO,KAAK,CAAC;SACd;QAED,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,GAAG,kBAAkB,EAAE,GAC7C,KAAK,CAAC,kBAAkB,CAAC;QAE3B,OAAO;YACL,2BAA2B,EAAE;gBAC3B,GAAG,KAAK,CAAC,2BAA2B;gBACpC,CAAC,SAAS,CAAC,EAAE,EAAE;aAChB;YACD,kBAAkB;SACnB,CAAC;IACJ,CAAC,CAAC;CACL,CAAC,EACF;IACE,IAAI,EAAE,oBAAoB;IAC1B,OAAO,EAAE,CAAC;IACV,UAAU,CAAC,EAAE,kBAAkB,EAAE;QAC/B,OAAO;YACL,kBAAkB;SACnB,CAAC;IACJ,CAAC;CACF,CACF,CACF,CAAC"}
|
package/dist/hooks/sui/useSui.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { useMutation } from "@tanstack/react-query";
|
|
3
3
|
import { useCallback, useEffect } from "react";
|
|
4
|
-
import { RecentWalletStorage } from "../../services";
|
|
5
4
|
import { useWalletStore } from "../store/useWalletStore";
|
|
6
5
|
import { useSuiWallets } from "./useSuiWallets";
|
|
7
6
|
export function useSui() {
|
|
8
7
|
const { wallets } = useSuiWallets();
|
|
9
8
|
const connectedSuiWallet = useWalletStore((store) => store.connectedWalletsByChainType[ChainType.SUI]);
|
|
9
|
+
const recentSuiWalletId = useWalletStore((store) => store.recentConnectorIds[ChainType.SUI]);
|
|
10
10
|
const setConnectedWallet = useWalletStore((store) => store.setConnectedWallet);
|
|
11
11
|
const disconnectWallet = useWalletStore((store) => store.disconnectWallet);
|
|
12
12
|
const connectSui = useMutation(async ({ wallet, }) => {
|
|
@@ -30,7 +30,6 @@ export function useSui() {
|
|
|
30
30
|
await connectedSuiWallet.wallet?.connector.disconnect();
|
|
31
31
|
}, [connectedSuiWallet.wallet]);
|
|
32
32
|
const autoConnectSui = useCallback(async () => {
|
|
33
|
-
const recentSuiWalletId = RecentWalletStorage.get(ChainType.SUI);
|
|
34
33
|
const recentSuiWallet = wallets.find((w) => w.connectorId === recentSuiWalletId);
|
|
35
34
|
if (!recentSuiWallet) {
|
|
36
35
|
return;
|
|
@@ -44,7 +43,7 @@ export function useSui() {
|
|
|
44
43
|
account,
|
|
45
44
|
});
|
|
46
45
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
47
|
-
}, [wallets.map((w) => w.connectorId)]);
|
|
46
|
+
}, [wallets.map((w) => w.connectorId), recentSuiWalletId]);
|
|
48
47
|
useEffect(() => {
|
|
49
48
|
const wallet = connectedSuiWallet.wallet;
|
|
50
49
|
if (!wallet) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAI/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useSui.js","sourceRoot":"","sources":["../../../src/hooks/sui/useSui.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,15 @@ export const useAllConnectedWalletBalances = ({ direction, queryOptions = {
|
|
|
57
57
|
enabled: Boolean(connectedAddresses?.[ChainType.SUI]),
|
|
58
58
|
},
|
|
59
59
|
});
|
|
60
|
+
const xrplBalancesQuery = useAllTokensWithBalanceForChainType({
|
|
61
|
+
chainType: ChainType.XRPL,
|
|
62
|
+
address: connectedAddresses?.[ChainType.XRPL],
|
|
63
|
+
direction,
|
|
64
|
+
queryOptions: {
|
|
65
|
+
...queryOptions,
|
|
66
|
+
enabled: Boolean(connectedAddresses?.[ChainType.XRPL]),
|
|
67
|
+
},
|
|
68
|
+
});
|
|
60
69
|
// Create a map of chain type to balance query results
|
|
61
70
|
const balanceQueries = useMemo(() => ({
|
|
62
71
|
[ChainType.EVM]: evmBalancesQuery,
|
|
@@ -64,12 +73,14 @@ export const useAllConnectedWalletBalances = ({ direction, queryOptions = {
|
|
|
64
73
|
[ChainType.BTC]: bitcoinBalancesQuery,
|
|
65
74
|
[ChainType.SOLANA]: solanaBalancesQuery,
|
|
66
75
|
[ChainType.SUI]: suiBalancesQuery,
|
|
76
|
+
[ChainType.XRPL]: xrplBalancesQuery,
|
|
67
77
|
}), [
|
|
68
78
|
evmBalancesQuery,
|
|
69
79
|
cosmosBalancesQuery,
|
|
70
80
|
bitcoinBalancesQuery,
|
|
71
81
|
solanaBalancesQuery,
|
|
72
82
|
suiBalancesQuery,
|
|
83
|
+
xrplBalancesQuery,
|
|
73
84
|
]);
|
|
74
85
|
// Combine all tokens from different chains
|
|
75
86
|
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":"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
|
|
1
|
+
{"version":3,"file":"useAllConnectedWalletBalances.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useAllConnectedWalletBalances.ts"],"names":[],"mappings":"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"}
|
|
@@ -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, getAllCosmosBalances, getAllEvmTokensBalance, getAllSolanaTokensBalance, getAllSuiTokensBalance, } from "../../services/external/rpcService";
|
|
7
|
+
import { getAllBitcoinTokensBalance, getAllCosmosBalances, getAllEvmTokensBalance, getAllSolanaTokensBalance, getAllSuiTokensBalance, getAllXrplTokensBalance, } 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
11
|
const { cosmosChains, suiChains, chains } = useSquidChains(direction);
|
|
12
|
-
const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens } = useSquidTokens(direction);
|
|
12
|
+
const { evmTokens, cosmosTokens, solanaTokens, bitcoinTokens, suiTokens, xrplTokens, } = useSquidTokens(direction);
|
|
13
13
|
const { keplrTypeWallet } = useCosmosContext();
|
|
14
14
|
const placeholderData = useMemo(() => {
|
|
15
15
|
const tokens = {
|
|
@@ -18,6 +18,7 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
18
18
|
[ChainType.SOLANA]: solanaTokens.map((t) => ({ ...t, balance: "0" })),
|
|
19
19
|
[ChainType.BTC]: bitcoinTokens.map((t) => ({ ...t, balance: "0" })),
|
|
20
20
|
[ChainType.SUI]: suiTokens.map((t) => ({ ...t, balance: "0" })),
|
|
21
|
+
[ChainType.XRPL]: xrplTokens.map((t) => ({ ...t, balance: "0" })),
|
|
21
22
|
};
|
|
22
23
|
if (!chainType) {
|
|
23
24
|
// Return all tokens with zero balance
|
|
@@ -37,6 +38,7 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
37
38
|
solanaTokens,
|
|
38
39
|
bitcoinTokens,
|
|
39
40
|
suiTokens,
|
|
41
|
+
xrplTokens,
|
|
40
42
|
]);
|
|
41
43
|
const isQueryEnabled = useMemo(() => {
|
|
42
44
|
// Respect the queryOptions.enabled override if provided
|
|
@@ -55,6 +57,8 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
55
57
|
return bitcoinTokens.length > 0;
|
|
56
58
|
case ChainType.SUI:
|
|
57
59
|
return suiTokens.length > 0;
|
|
60
|
+
case ChainType.XRPL:
|
|
61
|
+
return xrplTokens.length > 0;
|
|
58
62
|
}
|
|
59
63
|
}, [
|
|
60
64
|
chainType,
|
|
@@ -65,6 +69,7 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
65
69
|
solanaTokens.length,
|
|
66
70
|
bitcoinTokens.length,
|
|
67
71
|
suiTokens.length,
|
|
72
|
+
xrplTokens.length,
|
|
68
73
|
]);
|
|
69
74
|
const query = useQuery(keys().allTokensBalance(address, chainType), async () => {
|
|
70
75
|
// Return zero balances if no address
|
|
@@ -98,6 +103,12 @@ export const useAllTokensWithBalanceForChainType = ({ chainType, address, direct
|
|
|
98
103
|
case ChainType.SUI:
|
|
99
104
|
fetchedTokens = await getAllSuiTokensBalance(address, suiTokens, suiChains);
|
|
100
105
|
break;
|
|
106
|
+
case ChainType.XRPL:
|
|
107
|
+
const xrplChains = chains.filter((c) => c.chainType === ChainType.XRPL);
|
|
108
|
+
if (!xrplChains)
|
|
109
|
+
throw new Error("No XRPL chains found");
|
|
110
|
+
fetchedTokens = await getAllXrplTokensBalance(address, xrplTokens, xrplChains);
|
|
111
|
+
break;
|
|
101
112
|
default:
|
|
102
113
|
fetchedTokens = placeholderData.tokens;
|
|
103
114
|
break;
|