@@ -771,7 +771,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
value={liquidityRangeType === "full-range" ? "-∞" : priceLower}
onChange={(e) => setPriceLower(e.target.value, token0.decimals)}
/>
-
+
fUSDC per{" "}
{token0.name}
@@ -795,7 +795,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
onChange={(e) => setPriceUpper(e.target.value, token0.decimals)}
/>
-
+
fUSDC per{" "}
{token0.name}
@@ -819,12 +819,12 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
{breakdownHidden ? (
<>
Show Breakdown
-
{"<-"}
+
{"<-"}
) : (
<>
Hide breakdown
-
{"->"}
+
{"->"}
)}
@@ -893,7 +893,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
-
+
@@ -963,7 +963,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
>
Yield Breakdown
-
+
Pool Fees
@@ -1004,7 +1004,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
@@ -1015,7 +1015,7 @@ export const StakeForm = ({ mode, poolId, positionId }: StakeFormProps) => {
{showBoostIncentives && (
<>
-
+
3%
diff --git a/web/src/hooks/usePostions.ts b/web/src/hooks/usePostions.ts
index 86a859ec..7940c182 100644
--- a/web/src/hooks/usePostions.ts
+++ b/web/src/hooks/usePostions.ts
@@ -9,36 +9,36 @@ import { persist } from "zustand/middleware";
export type Position = {
// the age at which this was created, not received
served: {
- timestamp: number
- }
- positionId: number
+ timestamp: number;
+ };
+ positionId: number;
pool: {
- token: Token
- }
- lower: number
- upper: number
+ token: Token;
+ };
+ lower: number;
+ upper: number;
liquidity: {
fusdc: {
- valueUsd: string
- }
+ valueUsd: string;
+ };
token1: {
- valueUsd: string
- }
- }
-}
+ valueUsd: string;
+ };
+ };
+};
interface PositionStore {
// positionsLocal is a list of positions modified by local actions
- positionsLocal: { [positionId: number]: Position }
+ positionsLocal: { [positionId: number]: Position };
// positions is a key value store of the most up to date positions
// from the remote server and local
- positions: { [positionId: number]: Position }
+ positions: { [positionId: number]: Position };
// receive new positions, preferring the newest version of each position
- updatePositionsFromGraph: (newPositions: Array
) => void
+ updatePositionsFromGraph: (newPositions: Array) => void;
// store a local position update after depositing or withdrawing a stake
// it is assumed this is always newer/more accurate than the remote data
// the first time it is stored
- updatePositionLocal: (newPosition: Position) => void
+ updatePositionLocal: (newPosition: Position) => void;
}
const usePositionStore = create()(
@@ -47,33 +47,36 @@ const usePositionStore = create()(
return {
positions: [],
positionsLocal: {},
- updatePositionsFromGraph: (newPositions) => set(({ positionsLocal }) => {
- const positionsUpdated = newPositions.map(newPosition => {
- const local = positionsLocal[newPosition.positionId]
- if (local?.served.timestamp < newPosition.served.timestamp)
- return local
- return newPosition
- })
- return {
- positionsLocal,
- positions: positionsUpdated
- }
- }),
- updatePositionLocal: (newPosition) => set(({ positionsLocal, positions }) => ({
- positionsLocal: {
- ...positionsLocal,
- [newPosition.positionId]: newPosition
- },
- positions: {
- ...positions,
- [newPosition.positionId]: newPosition
- }
- }))
- }
- }, {
- name: 'position-store',
- }
- )
+ updatePositionsFromGraph: (newPositions) =>
+ set(({ positionsLocal }) => {
+ const positionsUpdated = newPositions.map((newPosition) => {
+ const local = positionsLocal[newPosition.positionId];
+ if (local?.served.timestamp < newPosition.served.timestamp)
+ return local;
+ return newPosition;
+ });
+ return {
+ positionsLocal,
+ positions: positionsUpdated,
+ };
+ }),
+ updatePositionLocal: (newPosition) =>
+ set(({ positionsLocal, positions }) => ({
+ positionsLocal: {
+ ...positionsLocal,
+ [newPosition.positionId]: newPosition,
+ },
+ positions: {
+ ...positions,
+ [newPosition.positionId]: newPosition,
+ },
+ })),
+ };
+ },
+ {
+ name: "position-store",
+ },
+ ),
);
const PositionsFragment = graphql(`
@@ -106,33 +109,35 @@ const PositionsFragment = graphql(`
}
}
}
-`)
+`);
export const usePositions = () => {
const { data: userData } = useGraphqlUser();
const positionsData = useFragment(PositionsFragment, userData?.getWallet);
- const {
- positions,
- updatePositionLocal,
- updatePositionsFromGraph
- } = usePositionStore();
+ const { positions, updatePositionLocal, updatePositionsFromGraph } =
+ usePositionStore();
- useMemo(() => positionsData && updatePositionsFromGraph(
- // postprocess this to assert that the nested address type is correct
- positionsData.positions.positions.map(p => ({
- ...p,
- pool: {
- ...p.pool,
- token: {
- ...p.pool.token,
- address: p.pool.token.address as `0x${string}`,
- }
- }
- }))
- ), [positionsData]);
+ useMemo(
+ () =>
+ positionsData &&
+ updatePositionsFromGraph(
+ // postprocess this to assert that the nested address type is correct
+ positionsData.positions.positions.map((p) => ({
+ ...p,
+ pool: {
+ ...p.pool,
+ token: {
+ ...p.pool.token,
+ address: p.pool.token.address as `0x${string}`,
+ },
+ },
+ })),
+ ),
+ [positionsData],
+ );
return {
positions: Object.values(positions),
updatePositionLocal,
};
-}
+};
diff --git a/web/src/lib/amounts.ts b/web/src/lib/amounts.ts
index 96b4308f..2703b686 100644
--- a/web/src/lib/amounts.ts
+++ b/web/src/lib/amounts.ts
@@ -3,7 +3,11 @@
import { Position } from "@/hooks/usePostions";
import { output as seawaterContract } from "@/lib/abi/ISeawaterAMM";
-import { getSqrtRatioAtTick, getTokenAmountsNumeric, sqrtPriceX96ToPrice } from "./math";
+import {
+ getSqrtRatioAtTick,
+ getTokenAmountsNumeric,
+ sqrtPriceX96ToPrice,
+} from "./math";
import { usdFormat } from "./usdFormat";
import { simulateContract } from "wagmi/actions";
import { config } from "@/config";
@@ -119,13 +123,17 @@ const getFormattedPriceFromTick = (
return formattedPrice.length > 20 ? "∞ " : formattedPrice;
};
-const getUsdTokenAmountsForPosition = async (position: Pick, token0: Token, tokenPrice: number): Promise<[number, number]> => {
+const getUsdTokenAmountsForPosition = async (
+ position: Pick,
+ token0: Token,
+ tokenPrice: number,
+): Promise<[number, number]> => {
const positionLiquidity = await simulateContract(config, {
address: ammAddress,
abi: seawaterContract.abi,
functionName: "positionLiquidity8D11C045",
args: [token0.address, BigInt(position.positionId)],
- })
+ });
const curTick = await simulateContract(config, {
address: ammAddress,
abi: seawaterContract.abi,
@@ -139,11 +147,12 @@ const getUsdTokenAmountsForPosition = async (position: Pick((set) => ({
// update raw amount if it doesn't exceed balance
if (!balanceRaw || amountRaw <= BigInt(balanceRaw))
setToken0AmountRaw(amountRaw.toString());
- } catch { }
+ } catch {}
return { token0Amount: amount };
});
},
@@ -120,7 +120,7 @@ export const useStakeStore = create((set) => ({
// update raw amount if it doesn't exceed balance
if (!balanceRaw || amountRaw <= BigInt(balanceRaw))
setToken1AmountRaw(amountRaw.toString());
- } catch { }
+ } catch {}
return { token1Amount: amount };
});
},
@@ -155,7 +155,7 @@ export const useStakeStore = create((set) => ({
setToken1AmountRaw(amount1.toString());
return { delta };
}
- } catch { }
+ } catch {}
return {};
});
},
@@ -177,7 +177,7 @@ export const useStakeStore = create((set) => ({
encodeSqrtPrice(priceN * 10 ** -decimals),
);
tick = newTick;
- } catch { }
+ } catch {}
set({
tickLower: tick,
priceLower: price,
@@ -197,7 +197,7 @@ export const useStakeStore = create((set) => ({
encodeSqrtPrice(priceN * 10 ** -decimals),
);
tick = newTick;
- } catch { }
+ } catch {}
set({
tickUpper: tick,
priceUpper: price,