@0xsquid/react-hooks 1.0.44-beta.3 → 1.0.44-beta.4
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 +2 -1
- package/dist/core/queries/queries-keys.js +5 -0
- package/dist/core/queries/queries-keys.js.map +1 -1
- package/dist/hooks/index.d.ts +1 -0
- package/dist/hooks/index.js +1 -0
- package/dist/hooks/index.js.map +1 -1
- package/dist/hooks/store/useHistoryStore.d.ts +2 -1
- package/dist/hooks/store/useHistoryStore.js +16 -12
- package/dist/hooks/store/useHistoryStore.js.map +1 -1
- package/dist/hooks/swap/useSwap.d.ts +4 -5
- package/dist/hooks/swap/useSwap.js +47 -101
- package/dist/hooks/swap/useSwap.js.map +1 -1
- package/dist/hooks/tokens/useSquidTokens.js +5 -0
- package/dist/hooks/tokens/useSquidTokens.js.map +1 -1
- package/dist/hooks/transaction/useAllTransactionsStatus.d.ts +4 -0
- package/dist/hooks/transaction/useAllTransactionsStatus.js +51 -0
- package/dist/hooks/transaction/useAllTransactionsStatus.js.map +1 -0
- package/dist/hooks/transaction/useSingleTransaction.d.ts +1 -2
- package/dist/hooks/transaction/useSingleTransaction.js +6 -20
- package/dist/hooks/transaction/useSingleTransaction.js.map +1 -1
- package/dist/hooks/user/useHistory.js +25 -7
- package/dist/hooks/user/useHistory.js.map +1 -1
- package/dist/services/internal/transactionService.d.ts +38 -2
- package/dist/services/internal/transactionService.js +57 -0
- package/dist/services/internal/transactionService.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import type { RouteResponse } from "@0xsquid/squid-types";
|
|
2
2
|
import { ChainType } from "@0xsquid/squid-types";
|
|
3
|
-
import { SimplifiedTransactionHistory } from "src/hooks/store/useHistoryStore";
|
|
4
3
|
import type { SlippageOption } from "../../core/types/config";
|
|
5
4
|
import type { SwapRoute } from "../../core/types/swap";
|
|
6
5
|
import type { TransactionParams } from "../../core/types/transaction";
|
|
6
|
+
import { SimplifiedTransactionHistory } from "../../hooks/store/useHistoryStore";
|
|
7
7
|
/**
|
|
8
8
|
* Cache keys implementation for react-query caching / invalidating
|
|
9
9
|
* For example if you invalidate a top level query, all its child will be invalidated, e.g "all" key
|
|
@@ -30,6 +30,7 @@ export declare const keys: ({ address, apiUrl, }: {
|
|
|
30
30
|
transactions: () => (string | undefined)[];
|
|
31
31
|
transaction: (swapDirection: SwapRoute | undefined, price: string | undefined, slippage: SlippageOption | undefined, infiniteApproval: boolean | undefined, getGasOnDestination: boolean | undefined, expressEnabled: boolean | undefined, sourceUserAddress: string | undefined, degenMode: boolean | undefined) => (string | number | boolean | undefined)[];
|
|
32
32
|
transactionStatus: (currentTransaction?: Pick<SimplifiedTransactionHistory, "transactionId" | "status" | "fromChain" | "toChain">) => (string | undefined)[];
|
|
33
|
+
allTransactionsStatus: (transactions?: Pick<SimplifiedTransactionHistory, "transactionId" | "status" | "fromChain" | "toChain">[]) => (string | undefined)[];
|
|
33
34
|
transactionStatusRefetcher: (currentTransaction?: TransactionParams) => (string | undefined)[];
|
|
34
35
|
routeApproved: (swapDirection: SwapRoute | undefined, sender: string | undefined, routeData: RouteResponse["route"] | undefined) => (string | undefined)[];
|
|
35
36
|
aproveRoute: (tokenAddress?: string, amount?: string) => (string | undefined)[];
|
|
@@ -94,6 +94,11 @@ export const keys = ({ address, apiUrl, }) => ({
|
|
|
94
94
|
currentTransaction?.toChain,
|
|
95
95
|
"transactionStatus",
|
|
96
96
|
],
|
|
97
|
+
allTransactionsStatus: (transactions) => [
|
|
98
|
+
...keys({ apiUrl, address }).transactions(),
|
|
99
|
+
transactions?.map((tx) => tx.transactionId).join(","),
|
|
100
|
+
"transactionStatus",
|
|
101
|
+
],
|
|
97
102
|
transactionStatusRefetcher: (currentTransaction) => [
|
|
98
103
|
...keys({ apiUrl, address }).transactions(),
|
|
99
104
|
currentTransaction?.routeType,
|
|
@@ -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":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAMjD;;;;GAIG;AACH,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,OAAO,EACP,MAAM,GAIP,EAAE,EAAE,CAAC,CAAC;IACL,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,CAAC;IAE7B,QAAQ;IACR,SAAS,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC;IAExE,SAAS;IACT,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC;IAElE,SAAS;IACT,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC;IAClE,cAAc,EAAE,CAAC,OAAyB,EAAE,EAAE,CAAC;QAC7C,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACrC,OAAO;QACP,gBAAgB;KACjB;IACD,WAAW,EAAE,CAAC,SAAgC,EAAE,EAAE,CAAC;QACjD,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACrC,SAAS,EAAE,WAAW;QACtB,SAAS,EAAE,SAAS;QACpB,SAAS,EAAE,cAAc;QACzB,SAAS,EAAE,gBAAgB;QAC3B,aAAa;KACd;IACD,gBAAgB,EAAE,CAAC,YAAqB,EAAE,OAAyB,EAAE,EAAE,CAAC;QACtE,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACrC,YAAY;QACZ,OAAO;QACP,kBAAkB;KACnB;IACD,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,cAAc,CAAC;IAElE,WAAW;IACX,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,UAAU,CAAC;IAC9D,OAAO,EAAE,CACP,OAAyB,EACzB,YAAqB,EACrB,WAAoB,EACpB,YAAuB,SAAS,CAAC,GAAG,EACpC,EAAE,CAAC;QACH,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;QACvC,OAAO;QACP,OAAO;QACP,YAAY;QACZ,SAAS;QACT,WAAW;QACX,SAAS;KACV;IACD,sBAAsB,EAAE,CACtB,OAAyB,EACzB,YAAqB,EACrB,YAAuB,SAAS,CAAC,GAAG,EACpC,EAAE,CAAC;QACH,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;QACvC,OAAO;QACP,OAAO;QACP,YAAY;QACZ,SAAS;QACT,eAAe;KAChB;IACD,qBAAqB,EAAE,CAAC,SAAqB,EAAE,OAAyB,EAAE,EAAE,CAAC;QAC3E,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;QACvC,OAAO;QACP,OAAO;QACP,SAAS;QACT,uBAAuB;KACxB;IAED,gBAAgB,EAAE,CAAC,SAAgC,EAAE,EAAE,CAAC;QACtD,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;QACvC,OAAO;QACP,SAAS;QACT,kBAAkB;KACnB;IAED,2BAA2B,EAAE,GAAG,EAAE,CAAC;QACjC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE;QACvC,OAAO;QACP,6BAA6B;KAC9B;IAED,eAAe;IACf,YAAY,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,EAAE,cAAc,CAAC;IACtE,WAAW,EAAE,CACX,aAAoC,EACpC,KAAyB,EACzB,QAAoC,EACpC,gBAAqC,EACrC,mBAAwC,EACxC,cAAmC,EACnC,iBAAqC,EACrC,SAA8B,EAC9B,EAAE,CAAC;QACH,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE;QAC3C,aAAa,EAAE,WAAW;QAC1B,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,cAAc;QAC7B,aAAa,EAAE,gBAAgB;QAC/B,KAAK;QACL,QAAQ;QACR,gBAAgB;QAChB,mBAAmB;QACnB,cAAc;QACd,iBAAiB;QACjB,SAAS;QACT,aAAa;KACd;IACD,iBAAiB,EAAE,CACjB,kBAGC,EACD,EAAE,CAAC;QACH,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE;QAC3C,kBAAkB,EAAE,aAAa;QACjC,kBAAkB,EAAE,MAAM;QAC1B,kBAAkB,EAAE,SAAS;QAC7B,kBAAkB,EAAE,OAAO;QAC3B,mBAAmB;KACpB;IACD,qBAAqB,EAAE,CACrB,YAGG,EACH,EAAE,CAAC;QACH,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE;QAC3C,YAAY,EAAE,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QACrD,mBAAmB;KACpB;IACD,0BAA0B,EAAE,CAAC,kBAAsC,EAAE,EAAE,CAAC;QACtE,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE;QAC3C,kBAAkB,EAAE,SAAS;QAC7B,kBAAkB,EAAE,aAAa;QACjC,kBAAkB,EAAE,MAAM;QAC1B,4BAA4B;KAC7B;IACD,aAAa,EAAE,CACb,aAAoC,EACpC,MAA0B,EAC1B,SAA6C,EAC7C,EAAE,CAAC;QACH,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE;QAC3C,aAAa,EAAE,WAAW;QAC1B,aAAa,EAAE,SAAS;QACxB,aAAa,EAAE,cAAc;QAC7B,aAAa,EAAE,gBAAgB;QAC/B,aAAa,EAAE,kBAAkB;QACjC,MAAM;QACN,SAAS,EAAE,QAAQ,EAAE,UAAU;QAC/B,eAAe;KAChB;IACD,WAAW,EAAE,CAAC,YAAqB,EAAE,MAAe,EAAE,EAAE,CAAC;QACvD,GAAG,IAAI,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC,YAAY,EAAE;QAC3C,YAAY;QACZ,MAAM;QACN,aAAa;KACd;CACF,CAAC,CAAC"}
|
package/dist/hooks/index.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export { useCosmosBalance, useEvmBalance, useNativeTokenBalanceDestinationChain,
|
|
|
11
11
|
export { useMultiChainBalance } from "./tokens/useMultiChainBalance";
|
|
12
12
|
export { useSquidTokens } from "./tokens/useSquidTokens";
|
|
13
13
|
export { useAllTokensWithBalanceForChain } from "./tokens/useTokensWithBalance";
|
|
14
|
+
export { useAllTransactionsStatus } from "./transaction/useAllTransactionsStatus";
|
|
14
15
|
export { useEstimate } from "./transaction/useEstimate";
|
|
15
16
|
export { useEstimatePriceImpact } from "./transaction/useEstimatePriceImpact";
|
|
16
17
|
export { useExecuteTransaction } from "./transaction/useExecuteTransaction";
|
package/dist/hooks/index.js
CHANGED
|
@@ -11,6 +11,7 @@ export { useCosmosBalance, useEvmBalance, useNativeTokenBalanceDestinationChain,
|
|
|
11
11
|
export { useMultiChainBalance } from "./tokens/useMultiChainBalance";
|
|
12
12
|
export { useSquidTokens } from "./tokens/useSquidTokens";
|
|
13
13
|
export { useAllTokensWithBalanceForChain } from "./tokens/useTokensWithBalance";
|
|
14
|
+
export { useAllTransactionsStatus } from "./transaction/useAllTransactionsStatus";
|
|
14
15
|
export { useEstimate } from "./transaction/useEstimate";
|
|
15
16
|
export { useEstimatePriceImpact } from "./transaction/useEstimatePriceImpact";
|
|
16
17
|
export { useExecuteTransaction } from "./transaction/useExecuteTransaction";
|
package/dist/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,qCAAqC,EACrC,8BAA8B,GAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,mCAAmC,EAAE,MAAM,8CAA8C,CAAC;AACnG,OAAO,EACL,gBAAgB,EAChB,aAAa,EACb,qCAAqC,EACrC,8BAA8B,GAC/B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,+BAA+B,EAAE,MAAM,+BAA+B,CAAC;AAChF,OAAO,EAAE,wBAAwB,EAAE,MAAM,wCAAwC,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC5E,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC1E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { StatusResponse } from "@0xsquid/squid-types";
|
|
1
2
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
2
3
|
export type SimplifiedTransactionHistory = {
|
|
3
4
|
fromChain: string;
|
|
@@ -21,7 +22,7 @@ export type SimplifiedTransactionHistory = {
|
|
|
21
22
|
enableBoost?: boolean;
|
|
22
23
|
nonce?: number;
|
|
23
24
|
routeType: string | undefined;
|
|
24
|
-
statusResponse?:
|
|
25
|
+
statusResponse?: StatusResponse;
|
|
25
26
|
sourceTxExplorerUrl?: string;
|
|
26
27
|
};
|
|
27
28
|
interface HistoryState {
|
|
@@ -1,19 +1,23 @@
|
|
|
1
1
|
import { create } from "zustand";
|
|
2
2
|
import { persist } from "zustand/middleware";
|
|
3
|
+
import { formatStatusResponseForStorage, formatTxForStorage, } from "../../services";
|
|
3
4
|
export const useHistoryStore = create(persist((set, _) => ({
|
|
4
5
|
transactions: [],
|
|
5
6
|
persistTransaction: (tx) => set((state) => ({
|
|
6
|
-
transactions: [...state.transactions, tx],
|
|
7
|
-
})),
|
|
8
|
-
replaceTransactionStatus: (transactionId, statusResponse, status) => set((state) => ({
|
|
9
|
-
transactions: state.transactions.map((tx) => tx.transactionId === transactionId
|
|
10
|
-
? {
|
|
11
|
-
...tx,
|
|
12
|
-
statusResponse: statusResponse ?? tx.statusResponse,
|
|
13
|
-
status,
|
|
14
|
-
}
|
|
15
|
-
: tx),
|
|
7
|
+
transactions: [...state.transactions, formatTxForStorage(tx)],
|
|
16
8
|
})),
|
|
9
|
+
replaceTransactionStatus: (transactionId, statusResponse, status) => {
|
|
10
|
+
const sr = formatStatusResponseForStorage(statusResponse);
|
|
11
|
+
set((state) => ({
|
|
12
|
+
transactions: state.transactions.map((tx) => tx.transactionId === transactionId
|
|
13
|
+
? {
|
|
14
|
+
...tx,
|
|
15
|
+
statusResponse: sr ?? tx.statusResponse,
|
|
16
|
+
status,
|
|
17
|
+
}
|
|
18
|
+
: tx),
|
|
19
|
+
}));
|
|
20
|
+
},
|
|
17
21
|
removeAllTransactions: () => set(() => ({
|
|
18
22
|
transactions: [],
|
|
19
23
|
})),
|
|
@@ -24,7 +28,7 @@ export const useHistoryStore = create(persist((set, _) => ({
|
|
|
24
28
|
const index = state.transactions.findIndex((tx) => tx.nonce === nonce && tx.fromAddress === fromAddress);
|
|
25
29
|
if (index !== -1) {
|
|
26
30
|
const newTransactions = [...state.transactions];
|
|
27
|
-
newTransactions[index] = newTx;
|
|
31
|
+
newTransactions[index] = formatTxForStorage(newTx);
|
|
28
32
|
return {
|
|
29
33
|
transactions: newTransactions,
|
|
30
34
|
};
|
|
@@ -32,6 +36,6 @@ export const useHistoryStore = create(persist((set, _) => ({
|
|
|
32
36
|
return state;
|
|
33
37
|
}),
|
|
34
38
|
}), {
|
|
35
|
-
name: "squid.history.store",
|
|
39
|
+
name: "squid.history.store.v2",
|
|
36
40
|
}));
|
|
37
41
|
//# sourceMappingURL=useHistoryStore.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHistoryStore.js","sourceRoot":"","sources":["../../../src/hooks/store/useHistoryStore.ts"],"names":[],"mappings":"
|
|
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;AA6CxB,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CACnC,OAAO,CACL,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IACX,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,CAC1C,EAAE,CAAC,aAAa,KAAK,aAAa;gBAChC,CAAC,CAAC;oBACE,GAAG,EAAE;oBACL,cAAc,EAAE,EAAE,IAAI,EAAE,CAAC,cAAc;oBACvC,MAAM;iBACP;gBACH,CAAC,CAAC,EAAE,CACP;SACF,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;gBACL,YAAY,EAAE,eAAe;aAC9B,CAAC;SACH;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;CACL,CAAC,EACF;IACE,IAAI,EAAE,wBAAwB;CAC/B,CACF,CACF,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { type Token } from "@0xsquid/squid-types";
|
|
2
1
|
export declare const useSwap: () => {
|
|
3
2
|
tokenItems: {
|
|
4
|
-
from: Token[];
|
|
5
|
-
to: Token[];
|
|
3
|
+
from: import("@0xsquid/squid-types").Token[];
|
|
4
|
+
to: import("@0xsquid/squid-types").Token[];
|
|
6
5
|
};
|
|
7
6
|
onSwapChange: ({ fromChainId, toChainId, fromTokenAddress, toTokenAddress, destinationAddress, fallbackAddress, }: {
|
|
8
7
|
fromChainId?: string | undefined;
|
|
@@ -15,8 +14,8 @@ export declare const useSwap: () => {
|
|
|
15
14
|
invertSwaps: () => void;
|
|
16
15
|
fromPrice: string | undefined;
|
|
17
16
|
fromPriceChanged: (price: string) => void;
|
|
18
|
-
toToken: Token | undefined;
|
|
19
|
-
fromToken: Token | undefined;
|
|
17
|
+
toToken: import("@0xsquid/squid-types").Token | undefined;
|
|
18
|
+
fromToken: import("@0xsquid/squid-types").Token | undefined;
|
|
20
19
|
fromChain: import("@0xsquid/squid-types").ChainData | undefined;
|
|
21
20
|
toChain: import("@0xsquid/squid-types").ChainData | undefined;
|
|
22
21
|
destinationAddress: string | undefined;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ChainType } from "@0xsquid/squid-types";
|
|
2
|
-
import { useCallback, useEffect, useMemo } from "react";
|
|
2
|
+
import { useCallback, useEffect, useMemo, useRef } from "react";
|
|
3
3
|
import { chainIdResetValue, destinationAddressResetValue, } from "../../core/constants";
|
|
4
4
|
import { useSquidChains } from "../../hooks/chains/useSquidChains";
|
|
5
5
|
import { useConfigStore, useSwapRoutePersistStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
@@ -13,113 +13,74 @@ export const useSwap = () => {
|
|
|
13
13
|
const { swapRoute } = useSwapRoutePersistStore();
|
|
14
14
|
const { tokens } = useSquidTokens();
|
|
15
15
|
const { chains, supportedDestinationChains, supportedSourceChains } = useSquidChains();
|
|
16
|
-
//
|
|
17
|
-
//
|
|
16
|
+
// Performance Optimization: Use refs for frequently changing values
|
|
17
|
+
// This prevents unnecessary re-renders when these values change
|
|
18
|
+
const configRef = useRef(config);
|
|
19
|
+
const tokensRef = useRef(tokens);
|
|
20
|
+
const chainsRef = useRef(chains);
|
|
21
|
+
useEffect(() => {
|
|
22
|
+
configRef.current = config;
|
|
23
|
+
tokensRef.current = tokens;
|
|
24
|
+
chainsRef.current = chains;
|
|
25
|
+
}, [config, tokens, chains]);
|
|
18
26
|
const sourceChainId = useMemo(() => swapRoute?.fromChainId ||
|
|
19
|
-
(
|
|
20
|
-
|
|
27
|
+
(chainsRef.current.find((c) => c.chainId === configRef.current.initialAssets?.from?.chainId) &&
|
|
28
|
+
configRef.current.initialAssets?.from?.chainId), [swapRoute?.fromChainId]);
|
|
21
29
|
const destChainId = useMemo(() => swapRoute?.toChainId ||
|
|
22
|
-
(
|
|
23
|
-
|
|
24
|
-
const fromChain = useMemo(() =>
|
|
25
|
-
|
|
26
|
-
const fromTokens = useMemo(() => getTokensForChain(
|
|
30
|
+
(chainsRef.current.find((c) => c.chainId === configRef.current.initialAssets?.to?.chainId) &&
|
|
31
|
+
configRef.current.initialAssets?.to?.chainId), [swapRoute?.toChainId]);
|
|
32
|
+
const fromChain = useMemo(() => chainsRef.current.find((c) => c.chainId === swapRoute?.fromChainId), [swapRoute?.fromChainId]);
|
|
33
|
+
const toChain = useMemo(() => chainsRef.current.find((c) => c.chainId === swapRoute?.toChainId), [swapRoute?.toChainId]);
|
|
34
|
+
const fromTokens = useMemo(() => getTokensForChain(tokensRef.current, sourceChainId), [sourceChainId]);
|
|
27
35
|
const fromToken = useMemo(() => fromTokens.find((t) => t.address === swapRoute?.fromTokenAddress), [fromTokens, swapRoute?.fromTokenAddress]);
|
|
28
|
-
const
|
|
29
|
-
// toTokens are squid tokens filtered by the destination chain, and some other filters like subgraph ids
|
|
30
|
-
const toTokens = useMemo(() => {
|
|
31
|
-
return filterTokensForDestination(getTokensForChain(tokens, destChainId), toChain, fromToken);
|
|
32
|
-
}, [tokens, destChainId, toChain, fromToken]);
|
|
36
|
+
const toTokens = useMemo(() => filterTokensForDestination(getTokensForChain(tokensRef.current, destChainId), toChain, fromToken), [destChainId, toChain, fromToken]);
|
|
33
37
|
const toToken = useMemo(() => toTokens.find((t) => t.address === swapRoute?.toTokenAddress), [toTokens, swapRoute?.toTokenAddress]);
|
|
34
|
-
const isSameChain =
|
|
35
|
-
const tokenItems = useMemo(() => ({
|
|
36
|
-
from: fromTokens,
|
|
37
|
-
to: toTokens,
|
|
38
|
-
}), [fromTokens, toTokens]);
|
|
39
|
-
const updatedDestinationAddress = useMemo(() => swapRoute?.destinationAddress, [swapRoute?.destinationAddress]);
|
|
38
|
+
const isSameChain = sourceChainId === destChainId;
|
|
39
|
+
const tokenItems = useMemo(() => ({ from: fromTokens, to: toTokens }), [fromTokens, toTokens]);
|
|
40
40
|
const { connectedAddress: destinationUserAddress } = useMultiChainWallet(toChain);
|
|
41
|
-
|
|
42
|
-
* Important to have a defined address otherwise the "getRoute" cannot be called
|
|
43
|
-
* TODO: Improve this check readability
|
|
44
|
-
*/
|
|
45
|
-
const destinationAddress = useMemo(() => {
|
|
46
|
-
if (updatedDestinationAddress)
|
|
47
|
-
return updatedDestinationAddress;
|
|
48
|
-
if (destinationUserAddress)
|
|
49
|
-
return destinationUserAddress;
|
|
50
|
-
return undefined;
|
|
51
|
-
}, [destinationUserAddress, updatedDestinationAddress]);
|
|
52
|
-
/**
|
|
53
|
-
* When user changes the price of the source token,
|
|
54
|
-
* This will update the destination token price
|
|
55
|
-
* @param price: string
|
|
56
|
-
*/
|
|
41
|
+
const destinationAddress = swapRoute?.destinationAddress || destinationUserAddress;
|
|
57
42
|
const fromPriceChanged = useCallback((price) => {
|
|
58
|
-
useTransactionStore.setState({
|
|
59
|
-
fromPrice: price || undefined,
|
|
60
|
-
});
|
|
43
|
+
useTransactionStore.setState({ fromPrice: price || undefined });
|
|
61
44
|
}, []);
|
|
62
45
|
/**
|
|
63
46
|
* Destination token address has different logic
|
|
64
47
|
* Some tokens are not available based on the source chain/token
|
|
65
|
-
* TODO: This could need a refactor
|
|
66
48
|
*/
|
|
67
49
|
const handleDestinationAddressOnSwapChange = useCallback((fromChainId, fromTokenAddress, toTokenAddress, toChainId) => {
|
|
68
|
-
const srcToken =
|
|
50
|
+
const srcToken = tokensRef.current.find((t) => t.address === (fromTokenAddress ?? swapRoute?.fromTokenAddress) &&
|
|
69
51
|
t.chainId === fromChainId);
|
|
70
|
-
const destChain =
|
|
71
|
-
const destinationTokensFiltered = filterTokensForDestination(getTokensForChain(
|
|
72
|
-
const defaultToAddress = getInitialOrDefaultTokenAddressForChain(destinationTokensFiltered,
|
|
52
|
+
const destChain = chainsRef.current.find((c) => c.chainId === (toChainId ?? swapRoute?.toChainId));
|
|
53
|
+
const destinationTokensFiltered = filterTokensForDestination(getTokensForChain(tokensRef.current, toChainId ?? swapRoute?.toChainId), destChain, srcToken);
|
|
54
|
+
const defaultToAddress = getInitialOrDefaultTokenAddressForChain(destinationTokensFiltered, configRef.current, toChainId ?? swapRoute?.toChainId, "to");
|
|
73
55
|
let destinationTokenAddress = toChainId && !toTokenAddress
|
|
74
56
|
? defaultToAddress
|
|
75
57
|
: toTokenAddress ?? swapRoute?.toTokenAddress;
|
|
76
|
-
// Re assign destination token address if it's not available
|
|
77
58
|
if (destinationTokensFiltered.find((t) => t.address === destinationTokenAddress) === undefined) {
|
|
78
59
|
destinationTokenAddress = defaultToAddress;
|
|
79
60
|
}
|
|
80
61
|
return destinationTokenAddress;
|
|
81
|
-
}, [
|
|
82
|
-
config,
|
|
83
|
-
fromTokens,
|
|
84
|
-
tokens,
|
|
85
|
-
swapRoute?.fromTokenAddress,
|
|
86
|
-
swapRoute?.toChainId,
|
|
87
|
-
swapRoute?.fromChainId,
|
|
88
|
-
swapRoute?.toTokenAddress,
|
|
89
|
-
toChain,
|
|
90
|
-
]);
|
|
62
|
+
}, [swapRoute]);
|
|
91
63
|
/**
|
|
92
|
-
* When user changes
|
|
93
|
-
*
|
|
64
|
+
* When user changes something from the SwapView
|
|
65
|
+
* param changed can be chains, tokens, or destination address
|
|
94
66
|
*/
|
|
95
67
|
const onSwapChange = useCallback(async ({ fromChainId, toChainId, fromTokenAddress, toTokenAddress, destinationAddress, fallbackAddress, }) => {
|
|
96
68
|
const srcChainId = fromChainId ?? swapRoute?.fromChainId;
|
|
97
|
-
|
|
98
|
-
// This can be either the first token or the one set by the user from config
|
|
99
|
-
const defaultFromAddress = getInitialOrDefaultTokenAddressForChain(tokens, config, srcChainId, "from");
|
|
100
|
-
// Get the destination ChainId based on parameters of swap received
|
|
69
|
+
const defaultFromAddress = getInitialOrDefaultTokenAddressForChain(tokensRef.current, configRef.current, srcChainId, "from");
|
|
101
70
|
const destinationChainId = toChainId === chainIdResetValue
|
|
102
71
|
? undefined
|
|
103
72
|
: toChainId ?? swapRoute?.toChainId;
|
|
104
|
-
// Destination Token Address based on parameters of swap received
|
|
105
|
-
// If the user only changed the chain, we need to get the default token address
|
|
106
|
-
// Otherwise, we use the one received
|
|
107
73
|
const sourceTokenAddress = fromChainId && !fromTokenAddress
|
|
108
74
|
? defaultFromAddress
|
|
109
75
|
: fromTokenAddress ?? swapRoute?.fromTokenAddress;
|
|
110
|
-
// Destination Token Address based on parameters of swap received
|
|
111
76
|
const destinationWalletAddress = destinationAddress === destinationAddressResetValue
|
|
112
77
|
? undefined
|
|
113
78
|
: destinationAddress ?? swapRoute?.destinationAddress;
|
|
114
|
-
// If destination wallet address is changed and fallback is not, reset fallback address
|
|
115
79
|
const fbAddress = destinationAddress === destinationAddressResetValue ||
|
|
116
80
|
(!!destinationAddress && !fallbackAddress)
|
|
117
81
|
? undefined
|
|
118
82
|
: fallbackAddress ?? swapRoute?.fallbackAddress;
|
|
119
|
-
// The destination token address is a bit different
|
|
120
|
-
// Some specific filters apply based on source chain & token
|
|
121
83
|
const destinationTokenAddress = handleDestinationAddressOnSwapChange(srcChainId, sourceTokenAddress, toTokenAddress, toChainId);
|
|
122
|
-
// Fire event
|
|
123
84
|
WidgetEvents.getInstance().dispatchSwapParamsChanged({
|
|
124
85
|
fromChainId: String(srcChainId),
|
|
125
86
|
toChainId: String(destinationChainId),
|
|
@@ -136,23 +97,11 @@ export const useSwap = () => {
|
|
|
136
97
|
fallbackAddress: fbAddress,
|
|
137
98
|
},
|
|
138
99
|
});
|
|
139
|
-
}, [
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
swapRoute?.fromTokenAddress,
|
|
145
|
-
swapRoute?.destinationAddress,
|
|
146
|
-
swapRoute?.fallbackAddress,
|
|
147
|
-
handleDestinationAddressOnSwapChange,
|
|
148
|
-
]);
|
|
149
|
-
/**
|
|
150
|
-
* Inverting selected prices, chains & tokens
|
|
151
|
-
*/
|
|
152
|
-
const invertSwaps = () => {
|
|
153
|
-
const isToChainDisabledOnSource = config.disabledChains?.source?.includes(String(destChainId));
|
|
154
|
-
const isFromChainDisabledOnDestination = config.disabledChains?.destination?.includes(String(sourceChainId));
|
|
155
|
-
// if any of the chains are disabled on the opposite direction, do not allow to invert swap
|
|
100
|
+
}, [swapRoute, handleDestinationAddressOnSwapChange]);
|
|
101
|
+
const invertSwaps = useCallback(() => {
|
|
102
|
+
// Check if inversion is allowed based on chain configurations
|
|
103
|
+
const isToChainDisabledOnSource = configRef.current.disabledChains?.source?.includes(String(destChainId));
|
|
104
|
+
const isFromChainDisabledOnDestination = configRef.current.disabledChains?.destination?.includes(String(sourceChainId));
|
|
156
105
|
if (isToChainDisabledOnSource || isFromChainDisabledOnDestination)
|
|
157
106
|
return;
|
|
158
107
|
WidgetEvents.getInstance().dispatchSwapParamsChanged({
|
|
@@ -169,30 +118,27 @@ export const useSwap = () => {
|
|
|
169
118
|
toTokenAddress: swapRoute?.fromTokenAddress,
|
|
170
119
|
},
|
|
171
120
|
});
|
|
172
|
-
};
|
|
173
|
-
|
|
174
|
-
const expressSupportedForThisRoute = useMemo(() => toChain?.chainType !== ChainType.COSMOS, [toChain?.chainType]);
|
|
121
|
+
}, [destChainId, sourceChainId, swapRoute]);
|
|
122
|
+
const expressSupportedForThisRoute = toChain?.chainType !== ChainType.COSMOS;
|
|
175
123
|
/**
|
|
176
124
|
* Init default chain ids and default token addresses
|
|
177
|
-
*
|
|
125
|
+
* Based on config & available tokens
|
|
178
126
|
*/
|
|
179
127
|
useEffect(() => {
|
|
180
|
-
if (
|
|
181
|
-
|
|
182
|
-
|
|
128
|
+
if (tokensRef.current.length > 0 &&
|
|
129
|
+
!useSwapRoutePersistStore.getState().swapRoute) {
|
|
130
|
+
const defaultFromChainId = getFirstAvailableChainId(configRef.current, "from", supportedSourceChains);
|
|
183
131
|
const defaultToChainId = getInitialChainIdFromConfig({
|
|
184
132
|
chains: supportedDestinationChains,
|
|
185
|
-
config,
|
|
133
|
+
config: configRef.current,
|
|
186
134
|
direction: "to",
|
|
187
135
|
});
|
|
188
|
-
|
|
189
|
-
const fromTokenAddress = getInitialOrDefaultTokenAddressForChain(tokens, config, defaultFromChainId, "from");
|
|
190
|
-
// if no initial token is found in config, we default to undefined
|
|
136
|
+
const fromTokenAddress = getInitialOrDefaultTokenAddressForChain(tokensRef.current, configRef.current, defaultFromChainId, "from");
|
|
191
137
|
const toTokenAddress = getInitialTokenAddressForChain({
|
|
192
138
|
chainId: defaultToChainId,
|
|
193
|
-
config,
|
|
139
|
+
config: configRef.current,
|
|
194
140
|
direction: "to",
|
|
195
|
-
tokens,
|
|
141
|
+
tokens: tokensRef.current,
|
|
196
142
|
unavailableTokenAddress: fromTokenAddress,
|
|
197
143
|
});
|
|
198
144
|
useSwapRoutePersistStore.setState({
|
|
@@ -205,7 +151,7 @@ export const useSwap = () => {
|
|
|
205
151
|
},
|
|
206
152
|
});
|
|
207
153
|
}
|
|
208
|
-
}, [
|
|
154
|
+
}, [supportedDestinationChains, supportedSourceChains]);
|
|
209
155
|
return {
|
|
210
156
|
tokenItems,
|
|
211
157
|
onSwapChange,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSwap.js","sourceRoot":"","sources":["../../../src/hooks/swap/useSwap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"useSwap.js","sourceRoot":"","sources":["../../../src/hooks/swap/useSwap.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export const useSquidTokens = (direction) => {
|
|
|
8
8
|
const config = useConfigStore((state) => state.config);
|
|
9
9
|
const disabledChainsForDirection = useMemo(() => getDisabledChainsIds({ config, direction }), [direction, config]);
|
|
10
10
|
const filterTokens = useCallback((tokens) => tokens.filter((token) => !disabledChainsForDirection.includes(String(token.chainId))), [disabledChainsForDirection]);
|
|
11
|
+
// TODO: Remove this when backend is ready
|
|
11
12
|
const convertPaths = useCallback((token) => ({
|
|
12
13
|
...token,
|
|
13
14
|
logoURI: token.logoURI?.includes("0xsquid/assets")
|
|
@@ -17,6 +18,8 @@ export const useSquidTokens = (direction) => {
|
|
|
17
18
|
: token.logoURI,
|
|
18
19
|
}), []);
|
|
19
20
|
const tokensWithUsdPriceUpdated = useMemo(() => {
|
|
21
|
+
// TODO: We should remove this when backend is ready
|
|
22
|
+
// Because it's causing re-renders to re-map icons paths as soon as we fetch sdk-info to get prices
|
|
20
23
|
const baseTokens = filterTokens(allSquidTokens?.length ? allSquidTokens : squid?.tokens ?? []).map(convertPaths);
|
|
21
24
|
if (squidInfoQuery.status !== "success")
|
|
22
25
|
return baseTokens;
|
|
@@ -33,6 +36,8 @@ export const useSquidTokens = (direction) => {
|
|
|
33
36
|
filterTokens,
|
|
34
37
|
convertPaths,
|
|
35
38
|
]);
|
|
39
|
+
// TODO: We'll need to have a backend attribute on tokens to know if they are EVM or Cosmos
|
|
40
|
+
// Because this works for now, but as soon as we add new chains, we'll need to have a better way to filter them
|
|
36
41
|
const { evmTokens, cosmosTokens } = useMemo(() => ({
|
|
37
42
|
evmTokens: tokensWithUsdPriceUpdated.filter((t) => !isNaN(Number(t.chainId))),
|
|
38
43
|
cosmosTokens: tokensWithUsdPriceUpdated.filter((t) => isNaN(Number(t.chainId))),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSquidTokens.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useSquidTokens.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useSquidTokens.js","sourceRoot":"","sources":["../../../src/hooks/tokens/useSquidTokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { useQuery } from "@tanstack/react-query";
|
|
2
|
+
import { axelarSuccessStatuses } from "../../core/constants";
|
|
3
|
+
import { keys } from "../../core/queries/queries-keys";
|
|
4
|
+
import { TransactionStatus } from "../../core/types/transaction";
|
|
5
|
+
import { fetchTransactionStatus } from "../../services";
|
|
6
|
+
import { useConfigStore, useTransactionStore } from "../store/useSquidStore";
|
|
7
|
+
import { useHistory } from "../user/useHistory";
|
|
8
|
+
export const useAllTransactionsStatus = ({ enabled }) => {
|
|
9
|
+
const { transactions, replaceTransactionStatus } = useHistory();
|
|
10
|
+
const config = useConfigStore((state) => state.config);
|
|
11
|
+
const requestId = useTransactionStore((state) => state.currentRequestId);
|
|
12
|
+
return useQuery({
|
|
13
|
+
queryKey: keys({ apiUrl: config.apiUrl }).allTransactionsStatus(transactions),
|
|
14
|
+
queryFn: async () => {
|
|
15
|
+
const statusPromises = transactions
|
|
16
|
+
.filter((tx) => !!tx.transactionId &&
|
|
17
|
+
tx.status !== "error" &&
|
|
18
|
+
tx.status !== "success")
|
|
19
|
+
.map((transaction) => fetchTransactionStatus({
|
|
20
|
+
transaction,
|
|
21
|
+
integratorId: config.integratorId,
|
|
22
|
+
currentRequestId: requestId,
|
|
23
|
+
}));
|
|
24
|
+
return Promise.all(statusPromises);
|
|
25
|
+
},
|
|
26
|
+
onSuccess: (statusResponses) => {
|
|
27
|
+
statusResponses.forEach((statusResponse, index) => {
|
|
28
|
+
const transaction = transactions[index];
|
|
29
|
+
if (transaction?.transactionId &&
|
|
30
|
+
statusResponse &&
|
|
31
|
+
axelarSuccessStatuses.includes(statusResponse.status ?? "") &&
|
|
32
|
+
transaction?.status !== "success") {
|
|
33
|
+
replaceTransactionStatus(transaction.transactionId, statusResponse, TransactionStatus.SUCCESS);
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
},
|
|
37
|
+
refetchInterval: (data) => {
|
|
38
|
+
const transactionsNeedingRefetch = data?.some((tx) => tx.status !== TransactionStatus.SUCCESS &&
|
|
39
|
+
tx.status !== TransactionStatus.ERROR);
|
|
40
|
+
return transactionsNeedingRefetch ? 5000 : false;
|
|
41
|
+
},
|
|
42
|
+
retryDelay: 5000,
|
|
43
|
+
retry: 4,
|
|
44
|
+
refetchOnWindowFocus: true,
|
|
45
|
+
enabled: enabled &&
|
|
46
|
+
transactions.length > 0 &&
|
|
47
|
+
transactions?.some((tx) => tx.status !== TransactionStatus.SUCCESS &&
|
|
48
|
+
tx.status !== TransactionStatus.ERROR),
|
|
49
|
+
});
|
|
50
|
+
};
|
|
51
|
+
//# sourceMappingURL=useAllTransactionsStatus.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useAllTransactionsStatus.js","sourceRoot":"","sources":["../../../src/hooks/transaction/useAllTransactionsStatus.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { StatusResponse } from "@0xsquid/squid-types";
|
|
2
1
|
import type { AxiosError } from "axios";
|
|
3
2
|
import { TransactionStatus } from "../../core/types/transaction";
|
|
4
3
|
import { SimplifiedTransactionHistory } from "../store/useHistoryStore";
|
|
@@ -7,6 +6,6 @@ export declare const useSingleTransaction: ({ transaction, retry, refetchOnWindo
|
|
|
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,14 +1,12 @@
|
|
|
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
7
|
import { useConfigStore, useTransactionStore, } from "../../hooks/store/useSquidStore";
|
|
9
|
-
import {
|
|
8
|
+
import { fetchTransactionStatus } from "../../services";
|
|
10
9
|
import { WidgetEvents } from "../../services/internal/eventService";
|
|
11
|
-
import { isCCTPBridge } from "../../services/internal/transactionService";
|
|
12
10
|
import { useSquidChains } from "../chains/useSquidChains";
|
|
13
11
|
import { useHistory } from "../user/useHistory";
|
|
14
12
|
export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowFocus = "always", }) => {
|
|
@@ -23,23 +21,11 @@ export const useSingleTransaction = ({ transaction, retry = 25, refetchOnWindowF
|
|
|
23
21
|
* @returns {StatusResponse} Status response
|
|
24
22
|
*/
|
|
25
23
|
const transactionStatusQuery = useQuery(keys({ apiUrl: config.apiUrl }).transactionStatus(transaction), async () => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
.
|
|
29
|
-
|
|
30
|
-
transactionId: transaction?.transactionId,
|
|
31
|
-
fromChainId: transaction?.fromChain,
|
|
32
|
-
toChainId: transaction?.toChain,
|
|
33
|
-
...(isCCTPBridge(transaction) ? { bridgeType: "cctp" } : {}),
|
|
34
|
-
},
|
|
35
|
-
headers: getQueryHeaders(config.integratorId, useTransactionStore.getState().currentRequestId ?? ""),
|
|
36
|
-
})
|
|
37
|
-
?.catch((error) => {
|
|
38
|
-
throw new Error("Fetch transaction status failed", {
|
|
39
|
-
cause: error,
|
|
40
|
-
});
|
|
24
|
+
return fetchTransactionStatus({
|
|
25
|
+
transaction,
|
|
26
|
+
integratorId: config.integratorId,
|
|
27
|
+
currentRequestId: useTransactionStore.getState().currentRequestId,
|
|
41
28
|
});
|
|
42
|
-
return response.data;
|
|
43
29
|
}, {
|
|
44
30
|
enabled: !!transaction?.transactionId &&
|
|
45
31
|
transaction !== undefined &&
|
|
@@ -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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"}
|
|
@@ -2,7 +2,8 @@ import { useCallback, useMemo } from "react";
|
|
|
2
2
|
import { TransactionStatus, } from "../../core/types/transaction";
|
|
3
3
|
import { useHistoryStore, } from "../store/useHistoryStore";
|
|
4
4
|
export const useHistory = () => {
|
|
5
|
-
const
|
|
5
|
+
const transactions = useHistoryStore((state) => state.transactions);
|
|
6
|
+
const { persistTransaction, replaceTransactionStatus, removeTransaction, replaceTransactionAtNonce, } = useHistoryStore();
|
|
6
7
|
const parseTransaction = (tx) => {
|
|
7
8
|
if (!tx.transactionId ||
|
|
8
9
|
!tx.params.toAddress ||
|
|
@@ -54,12 +55,29 @@ export const useHistory = () => {
|
|
|
54
55
|
.transactions?.find((th) => th.transactionId === transactionID);
|
|
55
56
|
}, []);
|
|
56
57
|
const globalStatus = useMemo(() => {
|
|
57
|
-
const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
58
|
+
const statusPriority = [
|
|
59
|
+
{
|
|
60
|
+
status: TransactionStatus.ERROR,
|
|
61
|
+
check: (tx) => tx.status === TransactionStatus.ERROR,
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
status: TransactionStatus.WARNING,
|
|
65
|
+
check: (tx) => tx.status === TransactionStatus.WARNING,
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
status: TransactionStatus.PENDING,
|
|
69
|
+
check: (tx) => [
|
|
70
|
+
TransactionStatus.PENDING,
|
|
71
|
+
TransactionStatus.ONGOING,
|
|
72
|
+
TransactionStatus.INITIAL_LOADING,
|
|
73
|
+
].includes(tx.status),
|
|
74
|
+
},
|
|
75
|
+
];
|
|
76
|
+
for (const { status, check } of statusPriority) {
|
|
77
|
+
if (transactions.some(check)) {
|
|
78
|
+
return status;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
63
81
|
return TransactionStatus.SUCCESS;
|
|
64
82
|
}, [transactions]);
|
|
65
83
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useHistory.js","sourceRoot":"","sources":["../../../src/hooks/user/useHistory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC7C,OAAO,EAEL,iBAAiB,GAClB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAEL,eAAe,GAChB,MAAM,0BAA0B,CAAC;AAElC,MAAM,CAAC,MAAM,UAAU,GAAG,GAAG,EAAE;IAC7B,MAAM,
|
|
1
|
+
{"version":3,"file":"useHistory.js","sourceRoot":"","sources":["../../../src/hooks/user/useHistory.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import type { ChainData } from "@0xsquid/squid-types";
|
|
2
|
-
import { SimplifiedTransactionHistory } from "src/hooks/store/useHistoryStore";
|
|
1
|
+
import type { ChainData, StatusResponse } from "@0xsquid/squid-types";
|
|
3
2
|
import type { TransactionHistoryStore, TransactionParams } from "../../core/types/transaction";
|
|
3
|
+
import { SimplifiedTransactionHistory } from "../../hooks/store/useHistoryStore";
|
|
4
4
|
export declare const formatTransactionHistoryDate: (transaction: TransactionHistoryStore | undefined) => {
|
|
5
5
|
month: string;
|
|
6
6
|
day: string;
|
|
@@ -21,6 +21,42 @@ export declare const formatDistance: (date: number | Date, baseDate: number | Da
|
|
|
21
21
|
locale?: Locale | undefined;
|
|
22
22
|
}) => string;
|
|
23
23
|
export declare const formatSeconds: (seconds: number, secondsTemplate?: string, minutesTemplate?: string) => string;
|
|
24
|
+
/**
|
|
25
|
+
* Remove the chainData from statusResponse to gain some storage space
|
|
26
|
+
* @param sr
|
|
27
|
+
* @returns
|
|
28
|
+
*/
|
|
29
|
+
export declare const formatStatusResponseForStorage: (sr?: StatusResponse) => StatusResponse | undefined;
|
|
30
|
+
export declare const formatTxForStorage: (tx: SimplifiedTransactionHistory) => {
|
|
31
|
+
statusResponse: StatusResponse | undefined;
|
|
32
|
+
fromChain: string;
|
|
33
|
+
fromToken: string;
|
|
34
|
+
fromAddress: string;
|
|
35
|
+
fromAmount: string;
|
|
36
|
+
toChain: string;
|
|
37
|
+
toToken: string;
|
|
38
|
+
transactionId: string;
|
|
39
|
+
toAddress: string;
|
|
40
|
+
toAmount: string;
|
|
41
|
+
toAmountMin: string;
|
|
42
|
+
exchangeRate: string;
|
|
43
|
+
status: import("../../core/types/transaction").TransactionStatus;
|
|
44
|
+
aggregatePriceImpact?: string | undefined;
|
|
45
|
+
toAmountMinUSD?: string | undefined;
|
|
46
|
+
fromAmountUSD?: string | undefined;
|
|
47
|
+
toAmountUSD?: string | undefined;
|
|
48
|
+
timestamp: number;
|
|
49
|
+
slippage?: number | undefined;
|
|
50
|
+
enableBoost?: boolean | undefined;
|
|
51
|
+
nonce?: number | undefined;
|
|
52
|
+
routeType: string | undefined;
|
|
53
|
+
sourceTxExplorerUrl?: string | undefined;
|
|
54
|
+
};
|
|
55
|
+
export declare const fetchTransactionStatus: ({ transaction, integratorId, currentRequestId, }: {
|
|
56
|
+
transaction?: Pick<SimplifiedTransactionHistory, "status" | "fromChain" | "toChain" | "transactionId"> | undefined;
|
|
57
|
+
integratorId: string;
|
|
58
|
+
currentRequestId?: string | undefined;
|
|
59
|
+
}) => Promise<StatusResponse>;
|
|
24
60
|
interface Locale {
|
|
25
61
|
locale?: string;
|
|
26
62
|
}
|
|
@@ -1,4 +1,7 @@
|
|
|
1
|
+
import axios, { AxiosError } from "axios";
|
|
2
|
+
import { squidApiBaseUrl } from "../../core/externalLinks";
|
|
1
3
|
import { TransactionType } from "../../core/types/transaction";
|
|
4
|
+
import { getQueryHeaders } from "./apiService";
|
|
2
5
|
export const formatTransactionHistoryDate = (transaction) => {
|
|
3
6
|
if (!transaction?.timestamp)
|
|
4
7
|
return undefined;
|
|
@@ -116,4 +119,58 @@ export const formatSeconds = (seconds, secondsTemplate = " seconds", minutesTemp
|
|
|
116
119
|
.replace(" minutes", minutesTemplate)
|
|
117
120
|
.replace(" minute", minutesTemplate);
|
|
118
121
|
};
|
|
122
|
+
/**
|
|
123
|
+
* Remove the chainData from statusResponse to gain some storage space
|
|
124
|
+
* @param sr
|
|
125
|
+
* @returns
|
|
126
|
+
*/
|
|
127
|
+
export const formatStatusResponseForStorage = (sr) => {
|
|
128
|
+
if (!sr) {
|
|
129
|
+
return sr;
|
|
130
|
+
}
|
|
131
|
+
const formattedSrcChain = sr.fromChain
|
|
132
|
+
? {
|
|
133
|
+
...sr.fromChain,
|
|
134
|
+
chainData: undefined,
|
|
135
|
+
}
|
|
136
|
+
: undefined;
|
|
137
|
+
const formattedDestChain = sr.toChain
|
|
138
|
+
? {
|
|
139
|
+
...sr.toChain,
|
|
140
|
+
chainData: undefined,
|
|
141
|
+
}
|
|
142
|
+
: undefined;
|
|
143
|
+
return {
|
|
144
|
+
...sr,
|
|
145
|
+
fromChain: formattedSrcChain,
|
|
146
|
+
toChain: formattedDestChain,
|
|
147
|
+
};
|
|
148
|
+
};
|
|
149
|
+
export const formatTxForStorage = (tx) => {
|
|
150
|
+
return {
|
|
151
|
+
...tx,
|
|
152
|
+
statusResponse: formatStatusResponseForStorage(tx.statusResponse),
|
|
153
|
+
};
|
|
154
|
+
};
|
|
155
|
+
export const fetchTransactionStatus = async ({ transaction, integratorId, currentRequestId, }) => {
|
|
156
|
+
const statusEndpoint = `${squidApiBaseUrl}/v2/status`;
|
|
157
|
+
try {
|
|
158
|
+
const response = await axios.get(statusEndpoint, {
|
|
159
|
+
params: {
|
|
160
|
+
transactionId: transaction?.transactionId,
|
|
161
|
+
fromChainId: transaction?.fromChain,
|
|
162
|
+
toChainId: transaction?.toChain,
|
|
163
|
+
...(isCCTPBridge(transaction) ? { bridgeType: "cctp" } : {}),
|
|
164
|
+
},
|
|
165
|
+
headers: getQueryHeaders(integratorId, currentRequestId ?? ""),
|
|
166
|
+
});
|
|
167
|
+
return response.data;
|
|
168
|
+
}
|
|
169
|
+
catch (error) {
|
|
170
|
+
if (error instanceof AxiosError) {
|
|
171
|
+
throw new Error("Fetch transaction status failed", { cause: error });
|
|
172
|
+
}
|
|
173
|
+
throw error;
|
|
174
|
+
}
|
|
175
|
+
};
|
|
119
176
|
//# sourceMappingURL=transactionService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transactionService.js","sourceRoot":"","sources":["../../../src/services/internal/transactionService.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transactionService.js","sourceRoot":"","sources":["../../../src/services/internal/transactionService.ts"],"names":[],"mappings":"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"}
|