@0xsquid/react-hooks 3.0.20 → 3.0.21
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/queries/queries-keys.d.ts +1 -1
- package/dist/core/queries/queries-keys.js +1 -1
- package/dist/core/queries/queries-keys.js.map +1 -1
- package/dist/hooks/store/useHistoryStore.js +12 -12
- package/dist/hooks/store/useHistoryStore.js.map +1 -1
- package/dist/hooks/transaction/useAllTransactionsStatus.js +10 -18
- package/dist/hooks/transaction/useAllTransactionsStatus.js.map +1 -1
- package/dist/hooks/transaction/useSingleTransaction.d.ts +2 -1
- package/dist/hooks/transaction/useSingleTransaction.js +5 -2
- package/dist/hooks/transaction/useSingleTransaction.js.map +1 -1
- package/dist/hooks/user/useHistory.d.ts +1 -0
- package/dist/hooks/user/useHistory.js +6 -0
- package/dist/hooks/user/useHistory.js.map +1 -1
- package/dist/provider/index.js +53 -47
- package/dist/provider/index.js.map +1 -1
- package/dist/services/internal/transactionService.d.ts +1 -0
- package/dist/services/internal/transactionService.js +10 -0
- package/dist/services/internal/transactionService.js.map +1 -1
- package/dist/tests/transactionService.test.js +18 -1
- package/dist/tests/transactionService.test.js.map +1 -1
- package/package.json +1 -1
|
@@ -47,7 +47,7 @@ export declare const keys: () => {
|
|
|
47
47
|
allTokensPriceUSDAndBalance: (address?: string) => (string | undefined)[];
|
|
48
48
|
transaction: (fromChainId: string | undefined, toChainId: string | undefined, toTokenAddress: string | undefined, fromTokenAddress: string | undefined, price: string | undefined, slippage: SlippageOption | undefined, getGasOnDestination: boolean | undefined, expressEnabled: boolean | undefined, sourceUserAddress: string | undefined, degenMode: boolean | undefined, destinationAddress: string | undefined, fallbackAddress: string | undefined) => (string | number | boolean | undefined)[];
|
|
49
49
|
transactionStatus: (currentTransaction?: Pick<SimplifiedTransactionHistory, "transactionId" | "status" | "fromChain" | "toChain" | "fromAddress">) => (string | undefined)[];
|
|
50
|
-
allTransactionsStatus: (transactions?: Pick<SimplifiedTransactionHistory, "transactionId" | "status" | "fromChain" | "toChain">[]) =>
|
|
50
|
+
allTransactionsStatus: (transactions?: Pick<SimplifiedTransactionHistory, "transactionId" | "status" | "fromChain" | "toChain">[]) => string[];
|
|
51
51
|
transactionStatusRefetcher: (currentTransaction?: TransactionParams) => (string | undefined)[];
|
|
52
52
|
routeApproved: (routeData: RouteResponse["route"] | undefined, allowanceInWei: bigint | undefined) => (string | undefined)[];
|
|
53
53
|
ensData: (address?: string) => (string | undefined)[];
|
|
@@ -117,7 +117,7 @@ export const keys = () => ({
|
|
|
117
117
|
allTransactionsStatus: (transactions) => [
|
|
118
118
|
...keys().transactions(),
|
|
119
119
|
QueryKeys.TransactionStatus,
|
|
120
|
-
transactions?.map((tx) => tx.transactionId)
|
|
120
|
+
...(transactions?.map((tx) => tx.transactionId) ?? []),
|
|
121
121
|
],
|
|
122
122
|
transactionStatusRefetcher: (currentTransaction) => [
|
|
123
123
|
...keys().transactions(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queries-keys.js","sourceRoot":"","sources":["../../../src/core/queries/queries-keys.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"queries-keys.js","sourceRoot":"","sources":["../../../src/core/queries/queries-keys.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { create } from "zustand";
|
|
2
2
|
import { persist } from "zustand/middleware";
|
|
3
|
-
import { formatStatusResponseForStorage, formatTxForStorage, } from "../../services";
|
|
4
|
-
export const useHistoryStore = create(persist((set
|
|
3
|
+
import { compareTransactionIds, formatStatusResponseForStorage, formatTxForStorage, } from "../../services";
|
|
4
|
+
export const useHistoryStore = create(persist((set) => ({
|
|
5
5
|
transactions: [],
|
|
6
6
|
persistTransaction: (tx) => set((state) => ({
|
|
7
7
|
transactions: [...state.transactions, formatTxForStorage(tx)],
|
|
@@ -9,13 +9,15 @@ export const useHistoryStore = create(persist((set, _) => ({
|
|
|
9
9
|
replaceTransactionStatus: (transactionId, statusResponse, status) => {
|
|
10
10
|
const sr = formatStatusResponseForStorage(statusResponse);
|
|
11
11
|
set((state) => ({
|
|
12
|
-
transactions: state.transactions.map((tx) =>
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
12
|
+
transactions: state.transactions.map((tx) => {
|
|
13
|
+
return compareTransactionIds(transactionId, tx.transactionId)
|
|
14
|
+
? {
|
|
15
|
+
...tx,
|
|
16
|
+
statusResponse: sr ?? tx.statusResponse,
|
|
17
|
+
status,
|
|
18
|
+
}
|
|
19
|
+
: tx;
|
|
20
|
+
}),
|
|
19
21
|
}));
|
|
20
22
|
},
|
|
21
23
|
removeAllTransactions: () => set(() => ({
|
|
@@ -29,9 +31,7 @@ export const useHistoryStore = create(persist((set, _) => ({
|
|
|
29
31
|
if (index !== -1) {
|
|
30
32
|
const newTransactions = [...state.transactions];
|
|
31
33
|
newTransactions[index] = formatTxForStorage(newTx);
|
|
32
|
-
return {
|
|
33
|
-
transactions: newTransactions,
|
|
34
|
-
};
|
|
34
|
+
return { transactions: newTransactions };
|
|
35
35
|
}
|
|
36
36
|
return state;
|
|
37
37
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHistoryStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useHistoryStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EACL,8BAA8B,EAC9B,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AA8CxB,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CACnC,OAAO,CACL,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"useHistoryStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useHistoryStore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAE7C,OAAO,EACL,qBAAqB,EACrB,8BAA8B,EAC9B,kBAAkB,GACnB,MAAM,gBAAgB,CAAC;AA8CxB,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CACnC,OAAO,CACL,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IACR,YAAY,EAAE,EAAE;IAChB,kBAAkB,EAAE,CAAC,EAAE,EAAE,EAAE,CACzB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACd,YAAY,EAAE,CAAC,GAAG,KAAK,CAAC,YAAY,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;KAC9D,CAAC,CAAC;IACL,wBAAwB,EAAE,CAAC,aAAa,EAAE,cAAc,EAAE,MAAM,EAAE,EAAE;QAClE,MAAM,EAAE,GAAG,8BAA8B,CAAC,cAAc,CAAC,CAAC;QAC1D,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACd,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC1C,OAAO,qBAAqB,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC;oBAC3D,CAAC,CAAC;wBACE,GAAG,EAAE;wBACL,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,cAAc;wBACvC,MAAM;qBACP;oBACH,CAAC,CAAC,EAAE,CAAC;YACT,CAAC,CAAC;SACH,CAAC,CAAC,CAAC;IACN,CAAC;IACD,qBAAqB,EAAE,GAAG,EAAE,CAC1B,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC;QACT,YAAY,EAAE,EAAE;KACjB,CAAC,CAAC;IACL,iBAAiB,EAAE,CAAC,aAAa,EAAE,EAAE,CACnC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACd,YAAY,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM,CACrC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,KAAK,aAAa,CAC3C;KACF,CAAC,CAAC;IACL,yBAAyB,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,EAAE,EAAE,CACvD,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACZ,MAAM,KAAK,GAAG,KAAK,CAAC,YAAY,CAAC,SAAS,CACxC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,KAAK,IAAI,EAAE,CAAC,WAAW,KAAK,WAAW,CAC7D,CAAC;QACF,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,MAAM,eAAe,GAAG,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;YAChD,eAAe,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YACnD,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC;SAC1C;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;CACL,CAAC,EACF;IACE,IAAI,EAAE,wBAAwB;CAC/B,CACF,CACF,CAAC"}
|
|
@@ -6,23 +6,16 @@ import { fetchTransactionStatus } from "../../services";
|
|
|
6
6
|
import { useConfigStore, useTransactionStore } from "../store/useSquidStore";
|
|
7
7
|
import { useHistory } from "../user/useHistory";
|
|
8
8
|
export const useAllTransactionsStatus = ({ enabled }) => {
|
|
9
|
-
const {
|
|
9
|
+
const { replaceTransactionStatus, pendingTransactions } = useHistory();
|
|
10
10
|
const config = useConfigStore((state) => state.config);
|
|
11
11
|
const requestId = useTransactionStore((state) => state.currentRequestId);
|
|
12
12
|
return useQuery({
|
|
13
|
-
queryKey: keys().allTransactionsStatus(
|
|
13
|
+
queryKey: keys().allTransactionsStatus(pendingTransactions),
|
|
14
14
|
queryFn: async () => {
|
|
15
|
-
if (!Array.isArray(transactions) || transactions.length === 0) {
|
|
16
|
-
return [];
|
|
17
|
-
}
|
|
18
|
-
const transactionsToProcess = transactions.filter((tx) => !!tx.transactionId && tx.status !== "error" && tx.status !== "success");
|
|
19
|
-
if (transactionsToProcess.length === 0) {
|
|
20
|
-
return [];
|
|
21
|
-
}
|
|
22
15
|
try {
|
|
23
16
|
if (config.apiUrl) {
|
|
24
17
|
const apiUrl = config.apiUrl;
|
|
25
|
-
const results = await Promise.all(
|
|
18
|
+
const results = await Promise.all(pendingTransactions.map((transaction) => fetchTransactionStatus({
|
|
26
19
|
transaction,
|
|
27
20
|
integratorId: config.integratorId,
|
|
28
21
|
currentRequestId: requestId,
|
|
@@ -43,28 +36,27 @@ export const useAllTransactionsStatus = ({ enabled }) => {
|
|
|
43
36
|
statusResponses.forEach((statusResponse) => {
|
|
44
37
|
if (statusResponse?.id &&
|
|
45
38
|
axelarSuccessStatuses.includes(statusResponse.status ?? "")) {
|
|
46
|
-
replaceTransactionStatus(
|
|
39
|
+
replaceTransactionStatus(
|
|
40
|
+
// Prefer fromChain transactionId if it exists because more reliable
|
|
41
|
+
// Sometimes "id" hashes has underscores and we want to avoid that
|
|
42
|
+
statusResponse.fromChain?.transactionId ?? statusResponse.id, statusResponse, TransactionStatus.SUCCESS);
|
|
47
43
|
}
|
|
48
44
|
});
|
|
49
45
|
}
|
|
50
46
|
},
|
|
51
47
|
refetchInterval: (data) => {
|
|
52
48
|
if (Array.isArray(data) && data.length > 0) {
|
|
53
|
-
const
|
|
49
|
+
const someTxPending = data.some((tx) => tx.status === TransactionStatus.INITIAL_LOADING ||
|
|
54
50
|
tx.status === TransactionStatus.PENDING ||
|
|
55
51
|
tx.status === TransactionStatus.ONGOING);
|
|
56
|
-
return
|
|
52
|
+
return someTxPending ? 5000 : false;
|
|
57
53
|
}
|
|
58
54
|
return false;
|
|
59
55
|
},
|
|
60
56
|
retryDelay: 5000,
|
|
61
57
|
retry: 4,
|
|
62
58
|
refetchOnWindowFocus: true,
|
|
63
|
-
enabled: enabled &&
|
|
64
|
-
Array.isArray(transactions) &&
|
|
65
|
-
transactions.length > 0 &&
|
|
66
|
-
transactions.some((tx) => tx.status !== TransactionStatus.SUCCESS &&
|
|
67
|
-
tx.status !== TransactionStatus.ERROR),
|
|
59
|
+
enabled: enabled && pendingTransactions.length > 0,
|
|
68
60
|
});
|
|
69
61
|
};
|
|
70
62
|
//# sourceMappingURL=useAllTransactionsStatus.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAllTransactionsStatus.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useAllTransactionsStatus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,EAAE,OAAO,EAAwB,EAAE,EAAE;IAC5E,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"useAllTransactionsStatus.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useAllTransactionsStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
2
2
|
import { SimplifiedTransactionHistory } from "../store/useHistoryStore";
|
|
3
|
-
export declare const useSingleTransaction: ({ transaction, retry, refetchOnWindowFocus, }: {
|
|
3
|
+
export declare const useSingleTransaction: ({ transaction, retry, refetchOnWindowFocus, enabled, }: {
|
|
4
4
|
transaction?: Pick<SimplifiedTransactionHistory, "status" | "transactionId" | "fromChain" | "toChain" | "fromAddress" | "isCCTP"> | undefined;
|
|
5
5
|
retry?: number | undefined;
|
|
6
6
|
refetchOnWindowFocus?: boolean | "always" | undefined;
|
|
7
|
+
enabled?: boolean | undefined;
|
|
7
8
|
}) => {
|
|
8
9
|
transactionStatusQuery: import("@tanstack/react-query").UseQueryResult<import("@0xsquid/squid-types").StatusResponse, Error>;
|
|
9
10
|
latestStatus: TransactionStatus;
|
|
@@ -9,7 +9,7 @@ import { fetchTransactionStatus, is404Error } from "../../services";
|
|
|
9
9
|
import { WidgetEvents } from "../../services/internal/eventService";
|
|
10
10
|
import { useSquidChains } from "../chains/useSquidChains";
|
|
11
11
|
import { useHistory } from "../user/useHistory";
|
|
12
|
-
export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowFocus = "always", }) => {
|
|
12
|
+
export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowFocus = "always", enabled = true, }) => {
|
|
13
13
|
const config = useConfigStore((state) => state.config);
|
|
14
14
|
const isInitialized = useConfigStore((state) => state.isInitialized);
|
|
15
15
|
const { replaceTransactionStatus, findHistoryItem } = useHistory();
|
|
@@ -31,7 +31,10 @@ export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowF
|
|
|
31
31
|
});
|
|
32
32
|
}, [transaction]);
|
|
33
33
|
const transactionStatusQuery = useQuery(keys().transactionStatus(transaction), fetchTransactionStatusWithLatestConfig, {
|
|
34
|
-
enabled:
|
|
34
|
+
enabled: enabled &&
|
|
35
|
+
transaction?.transactionId !== "0" &&
|
|
36
|
+
!!transaction?.transactionId &&
|
|
37
|
+
!!transaction.fromAddress &&
|
|
35
38
|
!!config.apiUrl &&
|
|
36
39
|
transaction !== undefined &&
|
|
37
40
|
currentHistoryItem?.status !== "error" &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSingleTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useSingleTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAChF,OAAO,EAAE,IAAI,EAAE,MAAM,iCAAiC,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EACL,cAAc,EACd,mBAAmB,GACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AACpE,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAE1D,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAEhD,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,WAAW,EACX,KAAK,GAAG,EAAE,EACV,oBAAoB,GAAG,QAAQ,
|
|
1
|
+
{"version":3,"file":"useSingleTransaction.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useSingleTransaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,4 +9,5 @@ export declare const useHistory: () => {
|
|
|
9
9
|
replaceNonceTx: (nonce: number, userAddress: string, tx: TransactionHistoryStore) => void;
|
|
10
10
|
findHistoryItem: (transactionID: string | undefined) => SimplifiedTransactionHistory | undefined;
|
|
11
11
|
parseTransaction: (tx: TransactionHistoryStore) => SimplifiedTransactionHistory | null;
|
|
12
|
+
pendingTransactions: SimplifiedTransactionHistory[];
|
|
12
13
|
};
|
|
@@ -5,6 +5,11 @@ import { useHistoryStore, } from "../store/useHistoryStore";
|
|
|
5
5
|
export const useHistory = () => {
|
|
6
6
|
const transactions = useHistoryStore((state) => state.transactions);
|
|
7
7
|
const { persistTransaction, replaceTransactionStatus, removeTransaction, replaceTransactionAtNonce, } = useHistoryStore();
|
|
8
|
+
const pendingTransactions = useMemo(() => {
|
|
9
|
+
return transactions.filter((tx) => tx.status === TransactionStatus.INITIAL_LOADING ||
|
|
10
|
+
tx.status === TransactionStatus.ONGOING ||
|
|
11
|
+
tx.status === TransactionStatus.PENDING);
|
|
12
|
+
}, [transactions]);
|
|
8
13
|
const parseTransaction = (tx) => {
|
|
9
14
|
if (!tx.transactionId || !tx.params.toAddress || !tx.params.fromAddress) {
|
|
10
15
|
return null;
|
|
@@ -88,6 +93,7 @@ export const useHistory = () => {
|
|
|
88
93
|
replaceNonceTx,
|
|
89
94
|
findHistoryItem,
|
|
90
95
|
parseTransaction,
|
|
96
|
+
pendingTransactions,
|
|
91
97
|
};
|
|
92
98
|
};
|
|
93
99
|
//# sourceMappingURL=useHistory.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHistory.js","sourceRoot":"","sources":["../../../src/hooks/user/useHistory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useHistory.js","sourceRoot":"","sources":["../../../src/hooks/user/useHistory.ts"],"names":[],"mappings":"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"}
|
package/dist/provider/index.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Squid } from "@0xsquid/sdk";
|
|
2
2
|
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
|
|
3
3
|
import { createConfig, http, injected } from "@wagmi/core";
|
|
4
|
-
import React, { createContext, useCallback, useEffect, useState } from "react";
|
|
4
|
+
import React, { createContext, useCallback, useEffect, useRef, useState, } from "react";
|
|
5
5
|
import { createClient } from "viem";
|
|
6
6
|
import { arbitrum, avalanche, base, blast, bsc, celo, fantom, kava, linea, mainnet, mantle, moonbeam, optimism, polygon, scroll, } from "viem/chains";
|
|
7
7
|
import { WagmiProvider } from "wagmi";
|
|
@@ -44,61 +44,67 @@ export const SquidProvider = ({ children, config, }) => {
|
|
|
44
44
|
return createClient({ chain, transport: http() });
|
|
45
45
|
},
|
|
46
46
|
}));
|
|
47
|
+
const sdkInitializedRef = useRef(false);
|
|
47
48
|
const initWagmiConfig = useCallback((chains) => {
|
|
48
49
|
const newConfig = createWagmiConfig(chains);
|
|
49
50
|
setWagmiConfig(newConfig);
|
|
50
51
|
useConfigStore.setState({ isInitialized: true, config: config });
|
|
51
52
|
}, [config]);
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
53
|
+
const initializeSdk = useCallback(async () => {
|
|
54
|
+
if (sdkInitializedRef.current) {
|
|
55
|
+
// SDK has already been initialized
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
sdkInitializedRef.current = true;
|
|
59
|
+
try {
|
|
60
|
+
const squid = new Squid({
|
|
61
|
+
integratorId: config.integratorId,
|
|
62
|
+
baseUrl: config.apiUrl ?? squidApiBaseUrl,
|
|
63
|
+
});
|
|
64
|
+
await squid.init();
|
|
65
|
+
// Reset config if integrator doesn't want to load local storage state
|
|
66
|
+
// From previous user session
|
|
67
|
+
// Or if integrator has set up some pre-defined states (initial tokens)
|
|
68
|
+
if (!config?.loadPreviousStateFromLocalStorage ||
|
|
69
|
+
config.initialAssets?.from ||
|
|
70
|
+
config.initialAssets?.to) {
|
|
71
|
+
useSwapRoutePersistStore.setState({
|
|
72
|
+
swapRoute: undefined,
|
|
73
|
+
destinationAddressHasBeenUpdated: undefined,
|
|
58
74
|
});
|
|
59
|
-
await squid.init();
|
|
60
|
-
// Reset config if integrator doesn't want to load local storage state
|
|
61
|
-
// From previous user session
|
|
62
|
-
// Or if integrator has set up some pre defined states (initial tokens)
|
|
63
|
-
if (!config?.loadPreviousStateFromLocalStorage ||
|
|
64
|
-
config.initialAssets?.from ||
|
|
65
|
-
config.initialAssets?.to) {
|
|
66
|
-
useSwapRoutePersistStore.setState({
|
|
67
|
-
swapRoute: undefined,
|
|
68
|
-
destinationAddressHasBeenUpdated: undefined,
|
|
69
|
-
});
|
|
70
|
-
}
|
|
71
|
-
useSquidStore.setState((_) => ({
|
|
72
|
-
config: getConfigWithDefaults({
|
|
73
|
-
apiUrl: config.apiUrl ?? squidApiBaseUrl,
|
|
74
|
-
...config,
|
|
75
|
-
}),
|
|
76
|
-
squid,
|
|
77
|
-
maintenanceMode: { active: false, message: undefined },
|
|
78
|
-
}));
|
|
79
|
-
initWagmiConfig(squid.chains);
|
|
80
75
|
}
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
76
|
+
useSquidStore.setState((_) => ({
|
|
77
|
+
config: getConfigWithDefaults({
|
|
78
|
+
apiUrl: config.apiUrl ?? squidApiBaseUrl,
|
|
79
|
+
...config,
|
|
80
|
+
}),
|
|
81
|
+
squid,
|
|
82
|
+
maintenanceMode: { active: false, message: undefined },
|
|
83
|
+
}));
|
|
84
|
+
initWagmiConfig(squid.chains);
|
|
85
|
+
}
|
|
86
|
+
catch (error) {
|
|
87
|
+
const isAxios503Error = error.isAxiosError &&
|
|
88
|
+
error.response?.status === 503;
|
|
89
|
+
if (isAxios503Error) {
|
|
90
|
+
const maintenanceMessage = error.response?.data
|
|
91
|
+
?.message ?? undefined;
|
|
92
|
+
useSquidStore.setState({
|
|
93
|
+
squid: undefined,
|
|
94
|
+
maintenanceMode: {
|
|
95
|
+
active: true,
|
|
96
|
+
message: maintenanceMessage,
|
|
97
|
+
},
|
|
98
|
+
});
|
|
98
99
|
}
|
|
99
|
-
|
|
100
|
-
|
|
100
|
+
else {
|
|
101
|
+
console.error("Error initializing SDK:", error);
|
|
102
|
+
}
|
|
103
|
+
}
|
|
101
104
|
}, [config, initWagmiConfig]);
|
|
105
|
+
useEffect(() => {
|
|
106
|
+
initializeSdk();
|
|
107
|
+
}, [initializeSdk]);
|
|
102
108
|
return (React.createElement(WagmiProvider, { config: wagmiConfig },
|
|
103
109
|
React.createElement(QueryClientProvider, { client: queryClient },
|
|
104
110
|
React.createElement(SquidContext.Provider, { value: undefined },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/provider/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AACzE,OAAO,EAAU,YAAY,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEnE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/provider/index.tsx"],"names":[],"mappings":"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"}
|
|
@@ -59,6 +59,7 @@ export declare const fetchTransactionStatus: ({ transaction, integratorId, curre
|
|
|
59
59
|
currentRequestId?: string | undefined;
|
|
60
60
|
apiUrl: string;
|
|
61
61
|
}) => Promise<StatusResponse>;
|
|
62
|
+
export declare const compareTransactionIds: (idA: string, idB: string) => boolean;
|
|
62
63
|
interface Locale {
|
|
63
64
|
locale?: string;
|
|
64
65
|
}
|
|
@@ -136,12 +136,14 @@ export const formatStatusResponseForStorage = (sr) => {
|
|
|
136
136
|
? {
|
|
137
137
|
...sr.fromChain,
|
|
138
138
|
chainData: undefined,
|
|
139
|
+
callEventLog: [],
|
|
139
140
|
}
|
|
140
141
|
: undefined;
|
|
141
142
|
const formattedDestChain = sr.toChain
|
|
142
143
|
? {
|
|
143
144
|
...sr.toChain,
|
|
144
145
|
chainData: undefined,
|
|
146
|
+
callEventLog: [],
|
|
145
147
|
}
|
|
146
148
|
: undefined;
|
|
147
149
|
return {
|
|
@@ -177,4 +179,12 @@ export const fetchTransactionStatus = async ({ transaction, integratorId, curren
|
|
|
177
179
|
throw new Error("Fetch transaction status failed", { cause: undefined });
|
|
178
180
|
}
|
|
179
181
|
};
|
|
182
|
+
export const compareTransactionIds = (idA, idB) => {
|
|
183
|
+
if (!idA || !idB) {
|
|
184
|
+
return false;
|
|
185
|
+
}
|
|
186
|
+
const normalizedA = idA.toLowerCase();
|
|
187
|
+
const normalizedB = idB.toLowerCase();
|
|
188
|
+
return normalizedA.includes(normalizedB) || normalizedB.includes(normalizedA);
|
|
189
|
+
};
|
|
180
190
|
//# sourceMappingURL=transactionService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactionService.js","sourceRoot":"","sources":["../../../src/services/internal/transactionService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"transactionService.js","sourceRoot":"","sources":["../../../src/services/internal/transactionService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { formatSeconds } from "../services";
|
|
1
|
+
import { compareTransactionIds, formatSeconds } from "../services";
|
|
2
2
|
describe("transactionService", () => {
|
|
3
3
|
describe("formatSeconds", () => {
|
|
4
4
|
test("returns the correct formatted string for seconds using the default template", () => {
|
|
@@ -32,5 +32,22 @@ describe("transactionService", () => {
|
|
|
32
32
|
expect(formatSeconds(60 * 60 * 23, "s", "m", "h")).toBe("23h");
|
|
33
33
|
});
|
|
34
34
|
});
|
|
35
|
+
describe("compareTransactionIds", () => {
|
|
36
|
+
test("returns true when one ID is a substring of the other", () => {
|
|
37
|
+
expect(compareTransactionIds("0xabcdef1234567890", "0xabcdef1234567890_1_2")).toBe(true);
|
|
38
|
+
});
|
|
39
|
+
test("returns false for different transaction IDs", () => {
|
|
40
|
+
expect(compareTransactionIds("0x1234567890abcdef", "0xfedcba0987654321")).toBe(false);
|
|
41
|
+
});
|
|
42
|
+
test("returns false when one ID is empty", () => {
|
|
43
|
+
expect(compareTransactionIds("0x1234567890abcdef", "")).toBe(false);
|
|
44
|
+
});
|
|
45
|
+
test("returns false when both IDs are empty", () => {
|
|
46
|
+
expect(compareTransactionIds("", "")).toBe(false);
|
|
47
|
+
});
|
|
48
|
+
test("returns true for case-insensitive matches", () => {
|
|
49
|
+
expect(compareTransactionIds("0xABCDEF1234567890", "0xabcdef1234567890")).toBe(true);
|
|
50
|
+
});
|
|
51
|
+
});
|
|
35
52
|
});
|
|
36
53
|
//# sourceMappingURL=transactionService.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactionService.test.js","sourceRoot":"","sources":["../../src/tests/transactionService.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"transactionService.test.js","sourceRoot":"","sources":["../../src/tests/transactionService.test.ts"],"names":[],"mappings":"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"}
|