-
+ {/*
*/}
diff --git a/src/state/burnStore.ts b/src/state/burnStore.ts
index d1e40fe..3b25152 100644
--- a/src/state/burnStore.ts
+++ b/src/state/burnStore.ts
@@ -27,7 +27,7 @@ export const useBurnState = create((set) => ({
export function useDerivedBurnInfo(
position?: PositionFromTokenId,
- asWETH = false,
+ asWNative = false,
): {
position?: Position;
liquidityPercentage?: Percent;
@@ -84,14 +84,14 @@ export function useDerivedBurnInfo(
const liquidityValue0 =
currency0 && discountedAmount0
? CurrencyAmount.fromRawAmount(
- asWETH ? currency0 : unwrappedToken(currency0),
+ asWNative ? currency0 : unwrappedToken(currency0),
discountedAmount0,
)
: undefined;
const liquidityValue1 =
currency1 && discountedAmount1
? CurrencyAmount.fromRawAmount(
- asWETH ? currency1 : unwrappedToken(currency1),
+ asWNative ? currency1 : unwrappedToken(currency1),
discountedAmount1,
)
: undefined;
@@ -107,7 +107,7 @@ export function useDerivedBurnInfo(
const { amount0: feeValue0, amount1: feeValue1 } = usePositionFees(
pool ?? undefined,
Number(position?.tokenId),
- asWETH,
+ asWNative,
);
const outOfRange =
diff --git a/src/state/swapStore.ts b/src/state/swapStore.ts
index c1dfd1f..a9e6375 100644
--- a/src/state/swapStore.ts
+++ b/src/state/swapStore.ts
@@ -185,7 +185,7 @@ export function useDerivedSwapInfo(): {
const toggledTrade = trade.trade ?? undefined
- const tickAfterSwap = trade.priceAfterSwap && TickMath.getTickAtSqrtRatio(JSBI.BigInt(trade.priceAfterSwap))
+ const tickAfterSwap = trade.priceAfterSwap && TickMath.getTickAtSqrtRatio(JSBI.BigInt(trade.priceAfterSwap[trade.priceAfterSwap.length - 1].toString()))
const allowedSlippage = useSwapSlippageTolerance(toggledTrade)
@@ -195,7 +195,9 @@ export function useDerivedSwapInfo(): {
inputError = `Insufficient ${amountIn.currency.symbol} balance`
}
- const poolAddress = currencies[SwapField.INPUT] && currencies[SwapField.OUTPUT] && computePoolAddress({
+ const isWrap = currencies.INPUT && currencies.OUTPUT && currencies.INPUT.wrapped.equals(currencies.OUTPUT.wrapped)
+
+ const poolAddress = isWrap ? undefined : currencies[SwapField.INPUT] && currencies[SwapField.OUTPUT] && computePoolAddress({
tokenA: currencies[SwapField.INPUT]!.wrapped,
tokenB: currencies[SwapField.OUTPUT]!.wrapped
}).toLowerCase() as Address
diff --git a/src/state/tokensStore.ts b/src/state/tokensStore.ts
new file mode 100644
index 0000000..2c42714
--- /dev/null
+++ b/src/state/tokensStore.ts
@@ -0,0 +1,41 @@
+import { Address } from "viem";
+import { create } from "zustand";
+import { createJSONStorage, persist } from "zustand/middleware";
+import deepMerge from 'lodash.merge'
+
+interface ImportedTokens {
+ [chainId: number]: {
+ [address: Address]: { id: Address, symbol: string, name: string, decimals: number }
+ }
+}
+
+interface TokensState {
+ importedTokens: ImportedTokens,
+ actions: {
+ importToken: (address: Address, symbol: string, name: string, decimals: number, chainId: number) => void;
+ }
+}
+
+export const useTokensState = create(persist((set, get) => ({
+ importedTokens: {},
+ actions: {
+ importToken: (address, symbol, name, decimals, chainId) => {
+ const { importedTokens } = get()
+
+ set({
+ importedTokens: {
+ ...importedTokens,
+ [chainId]: {
+ ...importedTokens[chainId],
+ [address]: {
+ id: address,
+ symbol,
+ name,
+ decimals
+ }
+ }
+ }
+ })
+ },
+ }
+}), { name: 'tokens-storage', storage: createJSONStorage(() => localStorage), merge: (persistedState, currentState) => deepMerge(currentState, persistedState) }))
\ No newline at end of file
diff --git a/src/state/userStore.ts b/src/state/userStore.ts
index e1eff96..aa5dcd7 100644
--- a/src/state/userStore.ts
+++ b/src/state/userStore.ts
@@ -13,6 +13,7 @@ interface PendingTransactions {
[hash: Address]: Transaction
}
+
interface UserState {
txDeadline: number;
slippage: Percent | "auto";
@@ -22,7 +23,7 @@ interface UserState {
setSlippage: (slippage: Percent | "auto") => void;
addPendingTransaction: (hash: Address) => void;
updatePendingTransaction: (hash: Address, transaction: Transaction) => void;
- deletePendingTransaction: (hash: Address) => void
+ deletePendingTransaction: (hash: Address) => void;
}
}
@@ -30,6 +31,7 @@ export const useUserState = create((set, get) => ({
txDeadline: 180,
slippage: "auto",
pendingTransactions: {},
+ importedTokens: {},
actions: {
setTxDeadline: (txDeadline) => set({
txDeadline
@@ -59,7 +61,7 @@ export const useUserState = create((set, get) => ({
set({
pendingTransactions
})
- }
+ },
}
}))
diff --git a/wagmi.config.ts b/wagmi.config.ts
index a9b2766..69701b0 100644
--- a/wagmi.config.ts
+++ b/wagmi.config.ts
@@ -1,7 +1,7 @@
import { ContractConfig, defineConfig } from '@wagmi/cli'
import { actions, react } from '@wagmi/cli/plugins'
import { ALGEBRA_FACTORY, ALGEBRA_POSITION_MANAGER, ALGEBRA_QUOTER, ALGEBRA_QUOTER_V2, ALGEBRA_ROUTER } from './src/constants/addresses'
-import { algebraFactoryABI, algebraPoolABI, algebraPositionManagerABI, algebraQuoterABI, algebraBasePluginABI, algebraRouterABI, algebraQuoterV2ABI } from './src/abis'
+import { algebraFactoryABI, algebraPoolABI, algebraPositionManagerABI, algebraQuoterABI, algebraBasePluginABI, algebraRouterABI, algebraQuoterV2ABI, wNativeABI } from './src/abis'
const contracts: ContractConfig[] = [
{
@@ -36,6 +36,10 @@ const contracts: ContractConfig[] = [
address: ALGEBRA_ROUTER,
abi: algebraRouterABI,
name: 'AlgebraRouter'
+ },
+ {
+ abi: wNativeABI,
+ name: 'WrappedNative'
}
]
diff --git a/yarn.lock b/yarn.lock
index 7d984ca..ece5b4f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -554,10 +554,10 @@
stream-browserify "^3.0.0"
util "^0.12.4"
-"@cryptoalgebra/integral-sdk@^0.11.9":
- version "0.11.9"
- resolved "https://registry.yarnpkg.com/@cryptoalgebra/integral-sdk/-/integral-sdk-0.11.9.tgz#5600120044365dc3aecb700996aa6c84f8dde292"
- integrity sha512-NsEleu8daHkSNlZv+obwVCaMjLJibqkaM5Gx+5m+e3NPoDQHG7Gu30u7wV48oLP3wpy3bOKELjdzgxEcaDNOyA==
+"@cryptoalgebra/integral-sdk@^0.11.11":
+ version "0.11.11"
+ resolved "https://registry.yarnpkg.com/@cryptoalgebra/integral-sdk/-/integral-sdk-0.11.11.tgz#662498b5da77d23a95431ba76cdf0ea09e3e7281"
+ integrity sha512-brGTn2eqyRaY+pW2Dlht8wX13zAd0U4pS74AnBuhmFEQOrAzR2cRhYm/b1zQBU4FdKPPekOCfR3ijF/3iUXpJw==
dependencies:
"@ethersproject/abi" "^5.7.0"
"@ethersproject/address" "^5.7.0"
@@ -1857,7 +1857,7 @@
dependencies:
"@babel/runtime" "^7.13.10"
-"@radix-ui/react-dialog@^1.0.5":
+"@radix-ui/react-dialog@^1.0.4", "@radix-ui/react-dialog@^1.0.5":
version "1.0.5"
resolved "https://registry.yarnpkg.com/@radix-ui/react-dialog/-/react-dialog-1.0.5.tgz#71657b1b116de6c7a0b03242d7d43e01062c7300"
integrity sha512-GjWJX/AUpB703eEBanuBnIWdIXg6NvJFCXcNlSZk4xdszCdhrJgBoUd1cGk67vFO+WdA2pfI/plOpqz/5GUP6Q==
@@ -2589,6 +2589,13 @@
dependencies:
"@types/lodash" "*"
+"@types/lodash.merge@^4.6.9":
+ version "4.6.9"
+ resolved "https://registry.yarnpkg.com/@types/lodash.merge/-/lodash.merge-4.6.9.tgz#93e94796997ed9a3ebe9ccf071ccaec4c6bc8fb8"
+ integrity sha512-23sHDPmzd59kUgWyKGiOMO2Qb9YtqRO/x4IhkgNUiPQ1+5MUVqi6bCZeq9nBJ17msjIMbEIO5u+XW4Kz6aGUhQ==
+ dependencies:
+ "@types/lodash" "*"
+
"@types/lodash@*":
version "4.14.199"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.199.tgz#c3edb5650149d847a277a8961a7ad360c474e9bf"
@@ -2621,6 +2628,13 @@
dependencies:
"@types/react" "*"
+"@types/react-window@^1.8.8":
+ version "1.8.8"
+ resolved "https://registry.yarnpkg.com/@types/react-window/-/react-window-1.8.8.tgz#c20645414d142364fbe735818e1c1e0a145696e3"
+ integrity sha512-8Ls660bHR1AUA2kuRvVG9D/4XpRC6wjAaPT9dil7Ckc76eP9TKWZwwmgfq8Q1LANX3QNDnoU4Zp48A3w+zK69Q==
+ dependencies:
+ "@types/react" "*"
+
"@types/react@*", "@types/react@^18.2.15":
version "18.2.25"
resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.25.tgz#99fa44154132979e870ff409dc5b6e67f06f0199"
@@ -4883,6 +4897,11 @@ function-bind@^1.1.1:
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+fuse.js@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-7.0.0.tgz#6573c9fcd4c8268e403b4fc7d7131ffcf99a9eb2"
+ integrity sha512-14F4hBIxqKvD4Zz/XjDc3y94mNZN6pRv3U13Udo0lNLCWRBUsrMv2xwcF/y/Z5sV6+FQW+/ow68cHpm4sunt8Q==
+
gensync@^1.0.0-beta.2:
version "1.0.0-beta.2"
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -5800,6 +5819,11 @@ match-sorter@^6.3.1:
"@babel/runtime" "^7.12.5"
remove-accents "0.4.2"
+"memoize-one@>=3.1.1 <6":
+ version "5.2.1"
+ resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
+ integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
+
merge-stream@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
@@ -6582,6 +6606,14 @@ react-transition-group@2.9.0:
prop-types "^15.6.2"
react-lifecycles-compat "^3.0.4"
+react-window@^1.8.10:
+ version "1.8.10"
+ resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.10.tgz#9e6b08548316814b443f7002b1cf8fd3a1bdde03"
+ integrity sha512-Y0Cx+dnU6NLa5/EvoHukUD0BklJ8qITCtVEPY1C/nL8wwoZ0b5aEw8Ff1dOVHw7fCzMt55XfJDd8S8W8LCaUCg==
+ dependencies:
+ "@babel/runtime" "^7.0.0"
+ memoize-one ">=3.1.1 <6"
+
react@>=17, react@^18.2.0:
version "18.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-18.2.0.tgz#555bd98592883255fa00de14f1151a917b5d77d5"
@@ -7445,6 +7477,13 @@ value-or-promise@^1.0.11, value-or-promise@^1.0.12:
resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.12.tgz#0e5abfeec70148c78460a849f6b003ea7986f15c"
integrity sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==
+vaul@^0.9.0:
+ version "0.9.0"
+ resolved "https://registry.yarnpkg.com/vaul/-/vaul-0.9.0.tgz#e45a653f89d6c5c8b3c32bac29b2ae3457481d9e"
+ integrity sha512-bZSySGbAHiTXmZychprnX/dE0EsSige88xtyyL3/MCRbrFotRPQZo7UdydGXZWw+CKbNOw5Ow8gwAo93/nB/Cg==
+ dependencies:
+ "@radix-ui/react-dialog" "^1.0.4"
+
victory-vendor@^36.6.8:
version "36.6.11"
resolved "https://registry.yarnpkg.com/victory-vendor/-/victory-vendor-36.6.11.tgz#acae770717c2dae541a54929c304ecab5ab6ac2a"