@0xsquid/react-hooks 1.0.45-beta.1 → 1.0.46
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/assets/images/icons/wallets/index.d.ts +0 -1
- package/dist/assets/images/icons/wallets/index.js +0 -1
- package/dist/assets/images/icons/wallets/index.js.map +1 -1
- package/dist/core/constants.d.ts +3 -3
- package/dist/core/constants.js +18 -45
- package/dist/core/constants.js.map +1 -1
- package/dist/core/queries/queries-keys.d.ts +5 -3
- package/dist/core/queries/queries-keys.js +12 -8
- package/dist/core/queries/queries-keys.js.map +1 -1
- package/dist/core/types/index.d.ts +1 -2
- package/dist/core/types/swap.d.ts +1 -2
- package/dist/core/types/wallet.d.ts +3 -20
- package/dist/core/types/wallet.js +1 -2
- package/dist/core/types/wallet.js.map +1 -1
- package/dist/hooks/chains/useSquidChains.d.ts +3 -1
- package/dist/hooks/chains/useSquidChains.js +13 -3
- package/dist/hooks/chains/useSquidChains.js.map +1 -1
- package/dist/hooks/cosmos/useCosmos.js +1 -1
- package/dist/hooks/cosmos/useCosmos.js.map +1 -1
- package/dist/hooks/index.d.ts +4 -2
- package/dist/hooks/index.js +4 -2
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/squid/useSquid.js +3 -2
- package/dist/hooks/squid/useSquid.js.map +1 -1
- package/dist/hooks/store/useHistoryStore.d.ts +47 -0
- package/dist/hooks/store/useHistoryStore.js +41 -0
- package/dist/hooks/store/useHistoryStore.js.map +1 -0
- package/dist/hooks/store/useSquidStore.d.ts +12 -59
- package/dist/hooks/store/useSquidStore.js +11 -28
- package/dist/hooks/store/useSquidStore.js.map +1 -1
- package/dist/hooks/swap/useSwap.d.ts +6 -8
- package/dist/hooks/swap/useSwap.js +93 -153
- package/dist/hooks/swap/useSwap.js.map +1 -1
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js +4 -18
- package/dist/hooks/tokens/useAllTokensWithBalanceForChainType.js.map +1 -1
- package/dist/hooks/tokens/useBalance.js +4 -4
- package/dist/hooks/tokens/useBalance.js.map +1 -1
- package/dist/hooks/tokens/useSingleTokenPrice.d.ts +19 -1
- package/dist/hooks/tokens/useSquidTokens.d.ts +76 -4
- package/dist/hooks/tokens/useSquidTokens.js +60 -103
- package/dist/hooks/tokens/useSquidTokens.js.map +1 -1
- package/dist/hooks/tokens/useTokensWithBalance.js +4 -3
- package/dist/hooks/tokens/useTokensWithBalance.js.map +1 -1
- package/dist/hooks/transaction/useAllTransactionsStatus.d.ts +4 -0
- package/dist/hooks/transaction/useAllTransactionsStatus.js +49 -0
- package/dist/hooks/transaction/useAllTransactionsStatus.js.map +1 -0
- package/dist/hooks/transaction/useEstimate.d.ts +58 -3
- package/dist/hooks/transaction/useEstimate.js +5 -5
- package/dist/hooks/transaction/useEstimate.js.map +1 -1
- package/dist/hooks/transaction/useEstimatePriceImpact.js +2 -2
- package/dist/hooks/transaction/useEstimatePriceImpact.js.map +1 -1
- package/dist/hooks/transaction/useExecuteTransaction.js +29 -40
- package/dist/hooks/transaction/useExecuteTransaction.js.map +1 -1
- package/dist/hooks/transaction/useExpress.js +2 -2
- package/dist/hooks/transaction/useExpress.js.map +1 -1
- package/dist/hooks/transaction/useGetRoute.d.ts +5 -0
- package/dist/hooks/transaction/useGetRoute.js +48 -21
- package/dist/hooks/transaction/useGetRoute.js.map +1 -1
- package/dist/hooks/transaction/useSingleTransaction.d.ts +3 -4
- package/dist/hooks/transaction/useSingleTransaction.js +21 -32
- package/dist/hooks/transaction/useSingleTransaction.js.map +1 -1
- package/dist/hooks/transaction/useTransaction.js +6 -3
- package/dist/hooks/transaction/useTransaction.js.map +1 -1
- package/dist/hooks/user/useHistory.d.ts +12 -0
- package/dist/hooks/user/useHistory.js +94 -0
- package/dist/hooks/user/useHistory.js.map +1 -0
- package/dist/hooks/user/useUserParams.js +2 -2
- package/dist/hooks/user/useUserParams.js.map +1 -1
- package/dist/hooks/wallet/useMultiChainWallet.d.ts +2 -2
- package/dist/hooks/wallet/useMultiChainWallet.js +13 -33
- package/dist/hooks/wallet/useMultiChainWallet.js.map +1 -1
- package/dist/provider/index.js +5 -5
- package/dist/provider/index.js.map +1 -1
- package/dist/services/external/secretService.d.ts +0 -1
- package/dist/services/external/secretService.js +1 -1
- package/dist/services/external/secretService.js.map +1 -1
- package/dist/services/index.d.ts +0 -1
- package/dist/services/index.js +0 -1
- package/dist/services/index.js.map +1 -1
- package/dist/services/internal/configService.d.ts +5 -5
- package/dist/services/internal/configService.js +23 -23
- package/dist/services/internal/configService.js.map +1 -1
- package/dist/services/internal/transactionService.d.ts +40 -20
- package/dist/services/internal/transactionService.js +59 -55
- package/dist/services/internal/transactionService.js.map +1 -1
- package/dist/services/internal/walletService.d.ts +1 -1
- package/dist/tests/configService.test.js +11 -70
- package/dist/tests/configService.test.js.map +1 -1
- package/package.json +2 -2
- package/dist/hooks/wallet/useEns.d.ts +0 -27
- package/dist/hooks/wallet/useEns.js +0 -66
- package/dist/hooks/wallet/useEns.js.map +0 -1
- package/dist/services/external/ens.d.ts +0 -11
- package/dist/services/external/ens.js +0 -91
- package/dist/services/external/ens.js.map +0 -1
|
@@ -11,14 +11,15 @@ import { TransactionErrorType } from "../../core/types/error";
|
|
|
11
11
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
12
12
|
import { getWorkingCosmosRpcUrl } from "../../services/external/rpcService";
|
|
13
13
|
import { getTransactionError } from "../../services/internal/errorService";
|
|
14
|
-
import { getSourceExplorerTxUrl
|
|
14
|
+
import { getSourceExplorerTxUrl } from "../../services/internal/transactionService";
|
|
15
15
|
import { useSquidChains } from "../../hooks//chains/useSquidChains";
|
|
16
|
-
import {
|
|
16
|
+
import { useConfigStore, useSquidStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
17
17
|
import { useSwap } from "../../hooks/swap/useSwap";
|
|
18
18
|
import { useEstimate } from "../../hooks/transaction/useEstimate";
|
|
19
19
|
import { useGnosisContext } from "../../hooks/wallet/useGnosisContext";
|
|
20
20
|
import { useMultiChainWallet } from "../../hooks/wallet/useMultiChainWallet";
|
|
21
21
|
import { WidgetEvents } from "../../services/internal/eventService";
|
|
22
|
+
import { useHistory } from "../user/useHistory";
|
|
22
23
|
var ExecutionState;
|
|
23
24
|
(function (ExecutionState) {
|
|
24
25
|
ExecutionState["NOT_ENOUGH_BALANCE"] = "NOT_ENOUGH_BALANCE";
|
|
@@ -30,12 +31,16 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
30
31
|
const { cosmosSigner } = useCosmosContext();
|
|
31
32
|
const { chains } = useSquidChains();
|
|
32
33
|
const queryClient = useQueryClient();
|
|
33
|
-
const
|
|
34
|
+
const squid = useSquidStore((state) => state.squid);
|
|
35
|
+
const config = useConfigStore((state) => state.config);
|
|
36
|
+
const currentTransaction = useTransactionStore((state) => state.currentTransaction);
|
|
37
|
+
const fromPrice = useTransactionStore((state) => state.fromPrice);
|
|
34
38
|
const { enoughBalanceToSwap } = useEstimate(squidRoute);
|
|
35
39
|
const { connector: activeConnector } = useAccount();
|
|
36
40
|
const { fromChain, toChain, fromToken, toToken, isSameChain } = useSwap();
|
|
37
41
|
const { getGnosisTransactionHash } = useGnosisContext();
|
|
38
|
-
const {
|
|
42
|
+
const { addTransaction, replaceTransactionStatus, replaceNonceTx } = useHistory();
|
|
43
|
+
const { connectedAddress: sourceUserAddress } = useMultiChainWallet(fromChain);
|
|
39
44
|
const signerReady = useMemo(() => {
|
|
40
45
|
if (fromChain?.chainType === ChainType.EVM) {
|
|
41
46
|
return signer.isSuccess;
|
|
@@ -56,27 +61,6 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
56
61
|
// TODO:; Add more states here
|
|
57
62
|
return ExecutionState.READY;
|
|
58
63
|
}, [enoughBalanceToSwap]);
|
|
59
|
-
/**
|
|
60
|
-
* This method is used to persist the transaction in local storage
|
|
61
|
-
* This way we can access user's transaction history
|
|
62
|
-
* TODO: This part will be fetched from the backend, using user address in the future
|
|
63
|
-
* @param txToPersist
|
|
64
|
-
* @param route
|
|
65
|
-
*/
|
|
66
|
-
const persistTransaction = async (txToPersist, route) => {
|
|
67
|
-
// Persisting the transaction in local storage
|
|
68
|
-
if (route) {
|
|
69
|
-
const previousHistoryList = usePersistStore.getState().transactionsHistory ?? [];
|
|
70
|
-
const newHistoryElement = {
|
|
71
|
-
...txToPersist,
|
|
72
|
-
params: route.params,
|
|
73
|
-
estimate: route.estimate,
|
|
74
|
-
};
|
|
75
|
-
usePersistStore.setState({
|
|
76
|
-
transactionsHistory: [...previousHistoryList, newHistoryElement],
|
|
77
|
-
});
|
|
78
|
-
}
|
|
79
|
-
};
|
|
80
64
|
/**
|
|
81
65
|
* Set the transaction state in the store
|
|
82
66
|
* This is useful to access the latest transaction from any hook
|
|
@@ -98,7 +82,7 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
98
82
|
sourceExplorerImgUrl: fromChain?.chainIconURI,
|
|
99
83
|
axelarUrl,
|
|
100
84
|
};
|
|
101
|
-
|
|
85
|
+
useTransactionStore.setState({
|
|
102
86
|
currentTransaction: tx,
|
|
103
87
|
});
|
|
104
88
|
return tx;
|
|
@@ -142,7 +126,11 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
142
126
|
axelarUrl: undefined,
|
|
143
127
|
});
|
|
144
128
|
if (txParams) {
|
|
145
|
-
|
|
129
|
+
addTransaction({
|
|
130
|
+
...txParams,
|
|
131
|
+
params: route.params,
|
|
132
|
+
estimate: route.estimate,
|
|
133
|
+
});
|
|
146
134
|
}
|
|
147
135
|
return response.code === 0;
|
|
148
136
|
}
|
|
@@ -175,14 +163,10 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
175
163
|
axelarUrl: undefined,
|
|
176
164
|
});
|
|
177
165
|
if (txParams) {
|
|
178
|
-
|
|
166
|
+
replaceNonceTx(newNonce, sourceUserAddress, {
|
|
179
167
|
...txParams,
|
|
180
168
|
params: route.params,
|
|
181
169
|
estimate: route.estimate,
|
|
182
|
-
};
|
|
183
|
-
// Need to store the new transaction hash on the previous transaction
|
|
184
|
-
usePersistStore.setState({
|
|
185
|
-
transactionsHistory: replaceTransactionAtNonce(newNonce, sourceUserAddress, usePersistStore.getState().transactionsHistory, newHistoryElement),
|
|
186
170
|
});
|
|
187
171
|
}
|
|
188
172
|
}
|
|
@@ -233,7 +217,11 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
233
217
|
axelarUrl: undefined,
|
|
234
218
|
});
|
|
235
219
|
if (txParams) {
|
|
236
|
-
|
|
220
|
+
addTransaction({
|
|
221
|
+
...txParams,
|
|
222
|
+
params: route.params,
|
|
223
|
+
estimate: route.estimate,
|
|
224
|
+
});
|
|
237
225
|
}
|
|
238
226
|
}
|
|
239
227
|
try {
|
|
@@ -268,9 +256,9 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
268
256
|
throw new Error("Invalid parameters or chain not found");
|
|
269
257
|
}, {
|
|
270
258
|
onError: (error) => {
|
|
271
|
-
const { currentTransaction: currentTx } =
|
|
259
|
+
const { currentTransaction: currentTx } = useTransactionStore.getState();
|
|
272
260
|
const errorObject = getTransactionError(error);
|
|
273
|
-
|
|
261
|
+
useTransactionStore.setState({
|
|
274
262
|
currentTransaction: {
|
|
275
263
|
...currentTx,
|
|
276
264
|
status: TransactionStatus.ERROR,
|
|
@@ -280,15 +268,16 @@ export const useExecuteTransaction = (squidRoute) => {
|
|
|
280
268
|
});
|
|
281
269
|
if (currentTx?.transactionId &&
|
|
282
270
|
errorObject?.type === TransactionErrorType.CALL_EXCEPTION) {
|
|
283
|
-
|
|
284
|
-
transactionsHistory: updateTransactionHistoryStatus(currentTransaction?.transactionId, TransactionStatus.ERROR, usePersistStore.getState().transactionsHistory, undefined),
|
|
285
|
-
});
|
|
271
|
+
replaceTransactionStatus(currentTx?.transactionId, currentTx?.statusResponse, TransactionStatus.ERROR);
|
|
286
272
|
}
|
|
287
273
|
},
|
|
288
274
|
onSuccess: () => {
|
|
289
|
-
const { currentTransaction: currentTx } =
|
|
275
|
+
const { currentTransaction: currentTx } = useTransactionStore.getState();
|
|
290
276
|
queryClient.invalidateQueries(keys({}).balances());
|
|
291
|
-
|
|
277
|
+
if (isSameChain && currentTx?.transactionId) {
|
|
278
|
+
replaceTransactionStatus(currentTx.transactionId, currentTx.statusResponse, TransactionStatus.SUCCESS);
|
|
279
|
+
}
|
|
280
|
+
useTransactionStore.setState({
|
|
292
281
|
currentTransaction: {
|
|
293
282
|
...currentTx,
|
|
294
283
|
sourceStatus: TransactionStatus.SUCCESS,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExecuteTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useExecuteTransaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"useExecuteTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useExecuteTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { useMemo } from "react";
|
|
2
|
-
import { useSquidStore } from "../../hooks/store/useSquidStore";
|
|
3
2
|
import { useSwap } from "../../hooks/swap/useSwap";
|
|
3
|
+
import { useConfigStore } from "../store/useSquidStore";
|
|
4
4
|
export const useEstimateExpress = () => {
|
|
5
5
|
const { toChain, expressSupportedForThisRoute } = useSwap();
|
|
6
|
-
const
|
|
6
|
+
const config = useConfigStore((state) => state.config);
|
|
7
7
|
const backendSupportingExpress = useMemo(() => toChain?.enableBoostByDefault, [toChain]);
|
|
8
8
|
const expressActivatedUI = useMemo(() => expressSupportedForThisRoute &&
|
|
9
9
|
config.enableExpress &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useExpress.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useExpress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"useExpress.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useExpress.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACrC,MAAM,EAAE,OAAO,EAAE,4BAA4B,EAAE,GAAG,OAAO,EAAE,CAAC;IAC5D,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAEvD,MAAM,wBAAwB,GAAG,OAAO,CACtC,GAAG,EAAE,CAAC,OAAO,EAAE,oBAAoB,EACnC,CAAC,OAAO,CAAC,CACV,CAAC;IAEF,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CACH,4BAA4B;QAC5B,MAAM,CAAC,aAAa;QACpB,wBAAwB,EAC1B;QACE,MAAM,CAAC,aAAa;QACpB,wBAAwB;QACxB,4BAA4B;KAC7B,CACF,CAAC;IAEF,MAAM,oBAAoB,GAAG,uCAAuC,CAAC;IAErE,MAAM,gBAAgB,GAAG,OAAO,CAC9B,GAAG,EAAE,CAAC,4BAA4B,IAAI,wBAAwB,EAC9D,CAAC,4BAA4B,EAAE,wBAAwB,CAAC,CACzD,CAAC;IAEF,OAAO;QACL,gBAAgB;QAChB,4BAA4B;QAC5B,kBAAkB;QAClB,wBAAwB;QACxB,oBAAoB;KACrB,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -28,4 +28,9 @@ export declare const useGetRouteWrapper: ({ enabled, cacheTime, staleTime, refet
|
|
|
28
28
|
} | undefined, unknown>;
|
|
29
29
|
showLoading: boolean;
|
|
30
30
|
squidRouteError: unknown;
|
|
31
|
+
routeData: {
|
|
32
|
+
estimate: import("@0xsquid/squid-types").Estimate;
|
|
33
|
+
transactionRequest?: import("@0xsquid/squid-types").SquidData | undefined;
|
|
34
|
+
params: RouteRequest;
|
|
35
|
+
} | undefined;
|
|
31
36
|
};
|
|
@@ -1,16 +1,17 @@
|
|
|
1
|
-
import { useMutation, useQuery } from "@tanstack/react-query";
|
|
1
|
+
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
|
2
2
|
import { constants, utils } from "ethers";
|
|
3
3
|
import { useCallback, useMemo } from "react";
|
|
4
4
|
import { osmosisChainId } from "../../core/constants";
|
|
5
5
|
import { useCosmosContext } from "../../core/providers/CosmosProvider";
|
|
6
6
|
import { keys } from "../../core/queries/queries-keys";
|
|
7
|
-
import { useSquidStore, useSwapRoutePersistStore, } from "../../hooks/store/useSquidStore";
|
|
7
|
+
import { useConfigStore, useSquidStore, useSwapRoutePersistStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
8
8
|
import { useUserParams } from "../../hooks/user/useUserParams";
|
|
9
9
|
import { useSwap } from "../swap/useSwap";
|
|
10
10
|
import { useMultiChainWallet } from "../wallet/useMultiChainWallet";
|
|
11
11
|
export const useGetRoute = () => {
|
|
12
12
|
const { getCosmosAddressForChain, isConnected: isCosmosConnected } = useCosmosContext();
|
|
13
|
-
const
|
|
13
|
+
const config = useConfigStore((state) => state.config);
|
|
14
|
+
const squid = useSquidStore((state) => state.squid);
|
|
14
15
|
const { swapRoute } = useSwapRoutePersistStore();
|
|
15
16
|
const { expressEnabled, gasEnabled } = useUserParams();
|
|
16
17
|
/**
|
|
@@ -88,7 +89,7 @@ export const useGetRoute = () => {
|
|
|
88
89
|
const { route, requestId } = await squid.getRoute({
|
|
89
90
|
...params,
|
|
90
91
|
});
|
|
91
|
-
|
|
92
|
+
useTransactionStore.setState({
|
|
92
93
|
currentRequestId: requestId,
|
|
93
94
|
});
|
|
94
95
|
return route;
|
|
@@ -97,22 +98,48 @@ export const useGetRoute = () => {
|
|
|
97
98
|
// TODO: this is a bit dangerous to base the type on the useQuery function indexing
|
|
98
99
|
// as it could change in the future
|
|
99
100
|
// type UseQueryOptionsType = Parameters<typeof useQuery>[2];
|
|
100
|
-
export const useGetRouteWrapper = ({ enabled, cacheTime =
|
|
101
|
+
export const useGetRouteWrapper = ({ enabled, cacheTime = 5 * 60 * 1000, // 5 minutes
|
|
102
|
+
staleTime = 60 * 1000, // 1 minute
|
|
103
|
+
refetchOnWindowFocus = (query) => Date.now() - query.state.dataUpdatedAt > 30000, // Update if older than 30 seconds, when window is focused
|
|
101
104
|
refetchIntervalInBackground = false, refetchInterval = 30000, }) => {
|
|
102
|
-
const
|
|
103
|
-
const
|
|
105
|
+
const config = useConfigStore((state) => state.config);
|
|
106
|
+
const squid = useSquidStore((state) => state.squid);
|
|
104
107
|
const getRouteMutation = useGetRoute();
|
|
105
|
-
const { fromChain, toChain, fromPrice, destinationAddress
|
|
106
|
-
const { connectedAddress:
|
|
108
|
+
const { fromChain, toChain, fromPrice, destinationAddress, fromToken, toToken, } = useSwap();
|
|
109
|
+
const { connectedAddress: sourceUserAddress } = useMultiChainWallet(fromChain);
|
|
110
|
+
const squidRouteQueryKeys = useMemo(() => keys({
|
|
111
|
+
address: destinationAddress,
|
|
112
|
+
apiUrl: config.apiUrl,
|
|
113
|
+
}).transaction(fromChain?.chainId, toChain?.chainId, toToken?.address, fromToken?.address, fromPrice, config.slippage, config.infiniteApproval, config.enableGetGasOnDestination, config.enableExpress, sourceUserAddress, config.degenMode), [
|
|
114
|
+
destinationAddress,
|
|
115
|
+
config.apiUrl,
|
|
116
|
+
fromChain?.chainId,
|
|
117
|
+
toChain?.chainId,
|
|
118
|
+
toToken?.address,
|
|
119
|
+
fromToken?.address,
|
|
120
|
+
fromPrice,
|
|
121
|
+
config.slippage,
|
|
122
|
+
config.infiniteApproval,
|
|
123
|
+
config.enableGetGasOnDestination,
|
|
124
|
+
config.enableExpress,
|
|
125
|
+
sourceUserAddress,
|
|
126
|
+
config.degenMode,
|
|
127
|
+
]);
|
|
128
|
+
const queryEnabled = enabled != undefined
|
|
129
|
+
? enabled
|
|
130
|
+
: squid !== undefined &&
|
|
131
|
+
fromPrice !== undefined &&
|
|
132
|
+
fromPrice !== "0" &&
|
|
133
|
+
toChain?.chainId !== undefined &&
|
|
134
|
+
toToken?.address !== undefined;
|
|
135
|
+
const queryClient = useQueryClient();
|
|
136
|
+
const cachedRouteData = queryClient.getQueryData(squidRouteQueryKeys);
|
|
107
137
|
/**
|
|
108
138
|
* Fetching route data from the API
|
|
109
139
|
* These data will be used to trigger the transaction
|
|
110
140
|
* @returns {Route} Route data
|
|
111
141
|
*/
|
|
112
|
-
const squidRoute = useQuery(
|
|
113
|
-
address: destinationAddress,
|
|
114
|
-
apiUrl: config.apiUrl,
|
|
115
|
-
}).transaction(swapRoute, fromPrice, config.slippage, config.infiniteApproval, config.enableGetGasOnDestination, config.enableExpress, sourceUserAddress, config.degenMode), async () => {
|
|
142
|
+
const squidRoute = useQuery(squidRouteQueryKeys, async () => {
|
|
116
143
|
const route = await getRouteMutation.mutateAsync({
|
|
117
144
|
fromChain: fromChain?.chainId,
|
|
118
145
|
toChain: toChain?.chainId,
|
|
@@ -125,23 +152,23 @@ refetchIntervalInBackground = false, refetchInterval = 30000, }) => {
|
|
|
125
152
|
});
|
|
126
153
|
return route;
|
|
127
154
|
}, {
|
|
128
|
-
enabled:
|
|
129
|
-
? enabled
|
|
130
|
-
: squid !== undefined &&
|
|
131
|
-
fromPrice !== undefined &&
|
|
132
|
-
fromPrice !== "0" &&
|
|
133
|
-
swapRoute?.toChainId !== undefined &&
|
|
134
|
-
swapRoute.toTokenAddress !== undefined,
|
|
155
|
+
enabled: queryEnabled,
|
|
135
156
|
cacheTime,
|
|
136
157
|
staleTime,
|
|
137
158
|
refetchOnWindowFocus,
|
|
138
159
|
refetchIntervalInBackground,
|
|
139
160
|
refetchInterval,
|
|
161
|
+
keepPreviousData: true,
|
|
140
162
|
});
|
|
141
163
|
/**
|
|
142
164
|
* If last updated data is older than X seconds and the query is currently loading, show loading indicator
|
|
143
165
|
*/
|
|
144
166
|
const showLoading = useMemo(() => squidRoute.isFetching || squidRoute.isRefetching, [squidRoute.isFetching, squidRoute.isRefetching]);
|
|
145
|
-
return {
|
|
167
|
+
return {
|
|
168
|
+
squidRoute,
|
|
169
|
+
showLoading,
|
|
170
|
+
squidRouteError: squidRoute.error,
|
|
171
|
+
routeData: queryEnabled ? squidRoute.data : cachedRouteData,
|
|
172
|
+
};
|
|
146
173
|
};
|
|
147
174
|
//# sourceMappingURL=useGetRoute.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useGetRoute.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useGetRoute.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"useGetRoute.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useGetRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import type { StatusResponse } from "@0xsquid/squid-types";
|
|
2
1
|
import type { AxiosError } from "axios";
|
|
3
|
-
import type { TransactionParams } from "../../core/types/transaction";
|
|
4
2
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
3
|
+
import { SimplifiedTransactionHistory } from "../store/useHistoryStore";
|
|
5
4
|
export declare const useSingleTransaction: ({ transaction, retry, refetchOnWindowFocus, }: {
|
|
6
|
-
transaction?:
|
|
5
|
+
transaction?: Pick<SimplifiedTransactionHistory, "status" | "fromChain" | "toChain" | "transactionId"> | undefined;
|
|
7
6
|
retry?: number | undefined;
|
|
8
7
|
refetchOnWindowFocus?: boolean | "always" | undefined;
|
|
9
8
|
}) => {
|
|
10
|
-
transactionStatusQuery: import("@tanstack/react-query").UseQueryResult<StatusResponse, Error | AxiosError<unknown, any>>;
|
|
9
|
+
transactionStatusQuery: import("@tanstack/react-query").UseQueryResult<import("@0xsquid/squid-types").StatusResponse, Error | AxiosError<unknown, any>>;
|
|
11
10
|
latestStatus: TransactionStatus;
|
|
12
11
|
};
|
|
@@ -1,41 +1,31 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
2
|
import { useQuery } from "@tanstack/react-query";
|
|
3
|
-
import axios from "axios";
|
|
4
3
|
import { useMemo, useState } from "react";
|
|
5
|
-
import { axelarEndStatuses, axelarSuccessStatuses
|
|
4
|
+
import { axelarEndStatuses, axelarSuccessStatuses } from "../../core/constants";
|
|
6
5
|
import { keys } from "../../core/queries/queries-keys";
|
|
7
6
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
8
|
-
import {
|
|
9
|
-
import {
|
|
7
|
+
import { useConfigStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
8
|
+
import { fetchTransactionStatus } from "../../services";
|
|
10
9
|
import { WidgetEvents } from "../../services/internal/eventService";
|
|
11
|
-
import {
|
|
10
|
+
import { useSquidChains } from "../chains/useSquidChains";
|
|
11
|
+
import { useHistory } from "../user/useHistory";
|
|
12
12
|
export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowFocus = "always", }) => {
|
|
13
|
-
const
|
|
13
|
+
const config = useConfigStore((state) => state.config);
|
|
14
|
+
const { replaceTransactionStatus, findHistoryItem } = useHistory();
|
|
14
15
|
const [refetchInterval, setRefetchInterval] = useState(10000);
|
|
15
|
-
const
|
|
16
|
+
const { getChainType } = useSquidChains();
|
|
17
|
+
const currentHistoryItem = useMemo(() => findHistoryItem(transaction?.transactionId), [findHistoryItem, transaction?.transactionId]);
|
|
16
18
|
/**
|
|
17
19
|
* Transaction status endpoint
|
|
18
20
|
* Squid api is using axelar endpoint and parsing the response
|
|
19
21
|
* @returns {StatusResponse} Status response
|
|
20
22
|
*/
|
|
21
23
|
const transactionStatusQuery = useQuery(keys({ apiUrl: config.apiUrl }).transactionStatus(transaction), async () => {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
.
|
|
25
|
-
|
|
26
|
-
transactionId: transaction?.transactionId,
|
|
27
|
-
fromChainId: transaction?.fromChain?.chainId,
|
|
28
|
-
toChainId: transaction?.toChain?.chainId,
|
|
29
|
-
...(isCCTPBridge(transaction) ? { bridgeType: "cctp" } : {}),
|
|
30
|
-
},
|
|
31
|
-
headers: getQueryHeaders(config.integratorId, useSquidStore.getState().currentRequestId ?? ""),
|
|
32
|
-
})
|
|
33
|
-
?.catch((error) => {
|
|
34
|
-
throw new Error("Fetch transaction status failed", {
|
|
35
|
-
cause: error,
|
|
36
|
-
});
|
|
24
|
+
return fetchTransactionStatus({
|
|
25
|
+
transaction,
|
|
26
|
+
integratorId: config.integratorId,
|
|
27
|
+
currentRequestId: useTransactionStore.getState().currentRequestId,
|
|
37
28
|
});
|
|
38
|
-
return response.data;
|
|
39
29
|
}, {
|
|
40
30
|
enabled: !!transaction?.transactionId &&
|
|
41
31
|
transaction !== undefined &&
|
|
@@ -53,28 +43,27 @@ export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowF
|
|
|
53
43
|
return refetchInterval; // Had to handle a variable here because after onError, we want the interval to stop
|
|
54
44
|
},
|
|
55
45
|
// At the moment Cosmos indexing takes more time, so need more time between retries
|
|
56
|
-
retryDelay: transaction?.fromChain
|
|
57
|
-
retry: transaction?.fromChain
|
|
46
|
+
retryDelay: getChainType(transaction?.fromChain) === ChainType.COSMOS ? 5000 : 3000,
|
|
47
|
+
retry: getChainType(transaction?.fromChain) === ChainType.COSMOS ? 6 : retry,
|
|
58
48
|
refetchOnWindowFocus,
|
|
59
49
|
onSuccess: (data) => {
|
|
60
50
|
const statusResponse = data;
|
|
61
51
|
// Dispatch event
|
|
62
52
|
WidgetEvents.getInstance().dispatchSwapStatus(statusResponse.squidTransactionStatus ?? "");
|
|
63
|
-
if (
|
|
53
|
+
if (transaction?.transactionId &&
|
|
54
|
+
statusResponse &&
|
|
64
55
|
axelarSuccessStatuses.includes(statusResponse.status ?? "") &&
|
|
65
56
|
currentHistoryItem?.status !== "success") {
|
|
66
|
-
|
|
67
|
-
transactionsHistory: updateTransactionHistoryStatus(transaction?.transactionId, TransactionStatus.SUCCESS, usePersistStore.getState().transactionsHistory, statusResponse),
|
|
68
|
-
});
|
|
57
|
+
replaceTransactionStatus(transaction?.transactionId, statusResponse, TransactionStatus.SUCCESS);
|
|
69
58
|
}
|
|
70
59
|
},
|
|
71
60
|
onError: (error) => {
|
|
72
61
|
// Check if axios error and if it's a 404
|
|
73
62
|
const is404 = error.cause?.response?.status === 404;
|
|
74
63
|
setRefetchInterval(-1);
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
}
|
|
64
|
+
if (transaction?.transactionId) {
|
|
65
|
+
replaceTransactionStatus(transaction?.transactionId, undefined, is404 ? TransactionStatus.NOT_FOUND : TransactionStatus.ERROR);
|
|
66
|
+
}
|
|
78
67
|
},
|
|
79
68
|
});
|
|
80
69
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSingleTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useSingleTransaction.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useSingleTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useSingleTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,18 +5,21 @@ import { useMemo } from "react";
|
|
|
5
5
|
import { useSigner } from "wagmi";
|
|
6
6
|
import { keys } from "../../core/queries/queries-keys";
|
|
7
7
|
import { getMainExplorerUrl } from "../../services/internal/transactionService";
|
|
8
|
-
import { useSquidStore, useSwapRoutePersistStore, } from "../../hooks/store/useSquidStore";
|
|
8
|
+
import { useConfigStore, useSquidStore, useSwapRoutePersistStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
9
9
|
import { useSwap } from "../../hooks/swap/useSwap";
|
|
10
10
|
import { useMultiChainWallet } from "../../hooks/wallet/useMultiChainWallet";
|
|
11
11
|
import { useExecuteTransaction } from "./useExecuteTransaction";
|
|
12
12
|
export const useTransaction = ({ squidRoute, }) => {
|
|
13
13
|
const signer = useSigner();
|
|
14
14
|
const queryClient = useQueryClient();
|
|
15
|
-
const
|
|
15
|
+
const config = useConfigStore((state) => state.config);
|
|
16
|
+
const squid = useSquidStore((state) => state.squid);
|
|
17
|
+
const currentTransaction = useTransactionStore((state) => state.currentTransaction);
|
|
18
|
+
const fromPrice = useTransactionStore((state) => state.fromPrice);
|
|
16
19
|
const { swapRoute } = useSwapRoutePersistStore();
|
|
17
20
|
const { swapQuery } = useExecuteTransaction(squidRoute);
|
|
18
21
|
const { fromChain, toChain, fromToken, toToken } = useSwap();
|
|
19
|
-
const { connectedAddress:
|
|
22
|
+
const { connectedAddress: sourceUserAddress } = useMultiChainWallet(fromChain);
|
|
20
23
|
const mainExplorerUrl = useMemo(() => {
|
|
21
24
|
return getMainExplorerUrl(currentTransaction);
|
|
22
25
|
}, [currentTransaction]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useTransaction.ts"],"names":[],"mappings":"AAAA,0EAA0E;AAE1E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE9E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4CAA4C,CAAC;AAGhF,OAAO,EACL,aAAa,EACb,wBAAwB,
|
|
1
|
+
{"version":3,"file":"useTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { TransactionHistoryStore, TransactionStatus } from "../../core/types/transaction";
|
|
2
|
+
import { SimplifiedTransactionHistory } from "../store/useHistoryStore";
|
|
3
|
+
export declare const useHistory: () => {
|
|
4
|
+
transactions: SimplifiedTransactionHistory[];
|
|
5
|
+
addTransaction: (tx: TransactionHistoryStore) => void;
|
|
6
|
+
replaceTransactionStatus: (transactionId: string, statusResponse: any, status: TransactionStatus) => void;
|
|
7
|
+
removeTransaction: (transactionId: string) => void;
|
|
8
|
+
globalStatus: TransactionStatus;
|
|
9
|
+
replaceNonceTx: (nonce: number, userAddress: string, tx: TransactionHistoryStore) => void;
|
|
10
|
+
findHistoryItem: (transactionID: string | undefined) => SimplifiedTransactionHistory | undefined;
|
|
11
|
+
parseTransaction: (tx: TransactionHistoryStore) => SimplifiedTransactionHistory | null;
|
|
12
|
+
};
|