From 53d41911b4c8b153347eb2f1f171a386ff84ecc4 Mon Sep 17 00:00:00 2001
From: Darya Kaviani <daryakaviani@Daryas-MacBook-Pro.local>
Date: Mon, 8 Aug 2022 23:15:56 -0700
Subject: [PATCH] review updates

---
 packages/frontend/src/state/lp/hooks.ts | 52 ++++++++++++++++---------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/packages/frontend/src/state/lp/hooks.ts b/packages/frontend/src/state/lp/hooks.ts
index 6fd89b4f4..2811784bd 100644
--- a/packages/frontend/src/state/lp/hooks.ts
+++ b/packages/frontend/src/state/lp/hooks.ts
@@ -19,10 +19,6 @@ const POOL_FEE = 3000
 const MAX_INT_128 = new BigNumber(2).pow(128).minus(1).toFixed(0)
 const x96 = new BigNumber(2).pow(96)
 
-/*** CONSTANTS ***/
-const TICK_SPACE = 60
-const COLLAT_RATIO = 2
-
 /*** ACTIONS ***/
 
 // Opening a mint and LP position and depositing
@@ -31,22 +27,39 @@ export const useOpenPositionDeposit = () => {
   const address = useAtomValue(addressAtom)
   const contract = useAtomValue(controllerHelperHelperContractAtom)
   const handleTransaction = useHandleTransaction()
-  const getTwapSqueethPrice = useGetTwapSqueethPrice()
   const getDebtAmount = useGetDebtAmount()
+  const squeethPoolContract = useAtomValue(squeethPoolContractAtom)
+  const isWethToken0 = useAtomValue(isWethToken0Atom)
   const openPositionDeposit = useAppCallback(
-    async (squeethToMint: BigNumber, lowerTickInput: number, upperTickInput: number, vaultId: number, onTxConfirmed?: () => void) => {
-      if (!contract || !address) return null
+    async (squeethToMint: BigNumber, lowerTickInput: number, upperTickInput: number, vaultId: number, collatRatio: number, slippage: number, onTxConfirmed?: () => void) => {
+      if (!contract || !address || !squeethPoolContract) return null
       
       const mintWSqueethAmount = fromTokenAmount(squeethToMint, OSQUEETH_DECIMALS)
-      const squeethPricePromise = getTwapSqueethPrice()
       const ethDebtPromise = getDebtAmount(mintWSqueethAmount)
-      const [squeethPrice, ethDebt] = await Promise.all([squeethPricePromise, ethDebtPromise])
-
-      const collateralToMint = ethDebt.multipliedBy(COLLAT_RATIO)
-      const collateralToLp = mintWSqueethAmount.multipliedBy(squeethPrice)
-
-      const lowerTick = nearestUsableTick(lowerTickInput, TICK_SPACE)
-      const upperTick = nearestUsableTick(upperTickInput, TICK_SPACE)
+      const poolStatePromise = getPoolState(squeethPoolContract)
+
+      // Calculate prices from ticks
+      const [ethDebt, { tick, tickSpacing }] = await Promise.all([ethDebtPromise, poolStatePromise])
+      const lowerTick = nearestUsableTick(lowerTickInput, Number(tickSpacing))
+      const upperTick = nearestUsableTick(upperTickInput, Number(tickSpacing))
+      const sqrtLowerPrice = new BigNumber(TickMath.getSqrtRatioAtTick(lowerTick).toString()).div(x96)
+      const sqrtUpperPrice = new BigNumber(TickMath.getSqrtRatioAtTick(upperTick).toString()).div(x96)
+      const squeethPrice = isWethToken0 ? new BigNumber(1).div(new BigNumber(TickMath.getSqrtRatioAtTick(Number(tick)).toString()).div(x96).pow(2))
+                                            : new BigNumber(TickMath.getSqrtRatioAtTick(Number(tick)).toString()).div(x96).pow(2)
+      const sqrtSqueethPrice = squeethPrice.sqrt()
+      const collateralToMint = ethDebt.multipliedBy(collatRatio)
+
+      // Lx = x * (sqrtSqueethPrice * sqrtUpperPrice) / (sqrtUpperPrice - sqrtSqueethPrice)
+      // y = Lx * (sqrtSqueethPrice - sqrtLowerPrice)
+      const liquidity = mintWSqueethAmount.times(sqrtSqueethPrice.times(sqrtUpperPrice)).div(sqrtUpperPrice.minus(sqrtSqueethPrice))
+      const collateralToLp = sqrtUpperPrice.lt(sqrtSqueethPrice) ? liquidity.times(sqrtUpperPrice.minus(sqrtLowerPrice))
+                            : sqrtSqueethPrice.lt(sqrtLowerPrice) ? new BigNumber(0)
+                            : liquidity.times(sqrtSqueethPrice.minus(sqrtLowerPrice))
+      
+      const amount0 = isWethToken0 ? collateralToLp : mintWSqueethAmount
+      const amount1 = isWethToken0 ? mintWSqueethAmount : collateralToLp
+      const amount0Min = amount0.times(new BigNumber(1).minus(slippage)).toFixed(0)
+      const amount1Min = amount1.times(new BigNumber(1).minus(slippage)).toFixed(0)
 
       const flashloanWMintDepositNftParams = {
         wPowerPerpPool: squeethPool,
@@ -56,8 +69,8 @@ export const useOpenPositionDeposit = () => {
         collateralToFlashloan: collateralToMint.toFixed(0),
         collateralToLp: collateralToLp.toFixed(0),
         collateralToWithdraw: 0,
-        amount0Min: 0,
-        amount1Min: 0,
+        amount0Min,
+        amount1Min,
         lowerTick: lowerTick,
         upperTick: upperTick,
       }
@@ -65,13 +78,14 @@ export const useOpenPositionDeposit = () => {
       return handleTransaction(
         contract.methods.flashloanWMintLpDepositNft(flashloanWMintDepositNftParams).send({
           from: address,
-          value: collateralToLp.toFixed(0),
+          value: collateralToLp.plus(collateralToMint).toFixed(0),
         }),
         onTxConfirmed,
       )
     },
-    [address, squeethPool, contract, handleTransaction, getTwapSqueethPrice, getDebtAmount],
+    [address, squeethPool, contract, handleTransaction, getDebtAmount],
   )
+
   return openPositionDeposit
 }