@exponent-labs/market-three-math 0.9.18 → 0.9.20

package/src/withdrawLiquidity.test.ts

@@ -87,6 +87,25 @@ describe("withdraw liquidity math", () => {
     })
   })
 
+  it("accepts live tick zero as a valid lower boundary", () => {
+    const ticks = makeTicks([
+      makeTick({
+        apyBasePoints: 0,
+        impliedRate: 1.0,
+        principalPt: 7n,
+        principalSy: 11n,
+        principalShareSupply: PRECISE_NUMBER_DENOM,
+        liquidityGross: 1n,
+      }),
+      makeTick({ apyBasePoints: 2, impliedRate: 2 }),
+    ])
+
+    expect(getPtAndSyOnWithdrawLiquidity(marketEmissions, ticks, makePosition(), 1n)).toEqual({
+      totalPtOut: 3n,
+      totalSyOut: 5n,
+    })
+  })
+
   it("returns full principal when burned shares cover the supply", () => {
     const ticks = makeTicks([
       makeTick({

package/src/withdrawLiquidity.ts

@@ -1,5 +1,7 @@
 import type { LpPositionCLMM, MarketThree, Ticks } from "@exponent-labs/exponent-fetcher"
 
+import { isLiveTick, successorTickIdx } from "./tickTree"
+
 const PRECISE_NUMBER_DENOM = 1_000_000_000_000n
 const SENTINEL_TICK_INDEX = 0xffffffff
 
@@ -7,7 +9,7 @@ const invariantError = (message: string) => new Error(`WithdrawLiquidityInvarian
 
 const getTickByIndex = (ticks: Ticks, tickIdx: number) => {
   const tick = ticks.ticksTree[tickIdx - 1]
-  if (!tick || tick.apyBasePoints <= 0) {
+  if (!isLiveTick(tick)) {
     throw invariantError(`missing tick at index ${tickIdx}`)
   }
 
@@ -16,22 +18,7 @@ const getTickByIndex = (ticks: Ticks, tickIdx: number) => {
 
 const getTickKey = (ticks: Ticks, tickIdx: number) => getTickByIndex(ticks, tickIdx).apyBasePoints
 
-const successorIdx = (ticks: Ticks, tickIdx: number): number | null => {
-  const tickKey = getTickKey(ticks, tickIdx)
-  let best: { tickIdx: number; key: number } | null = null
-
-  for (let index = 0; index < ticks.ticksTree.length; index++) {
-    const key = ticks.ticksTree[index].apyBasePoints
-    if (key <= tickKey) {
-      continue
-    }
-    if (!best || key < best.key) {
-      best = { tickIdx: index + 1, key }
-    }
-  }
-
-  return best?.tickIdx ?? null
-}
+const successorIdx = (ticks: Ticks, tickIdx: number): number | null => successorTickIdx(ticks, tickIdx)
 
 const splitSuccessorForEpoch = (ticks: Ticks, leftIdx: number, rightIdx: number, splitEpoch: bigint): number | null => {
   let cursor = successorIdx(ticks, leftIdx)

package/src/ytTrades.ts

@@ -408,10 +408,10 @@ export function simulateSellYt(marketState: MarketThreeState, args: SellYtSimula
     throw new Error(`Trade too small: merging ${ytIn} YT yields 0 SY`)
   }
 
-  // On-chain uses pt_constraint + 2 to account for rounding, so we match that behavior
-  const ptNeeded = ytIn + 2
+  // On-chain SellYt forwards yt_in directly as the exact-out PT target.
+  const ptNeeded = ytIn
 
-  // Match on-chain SellYt exactly: TradePtExactOut with pt_target = yt_in + 2 and SY budget = syFromMerge
+  // Match on-chain SellYt exactly: TradePtExactOut with pt_target = yt_in and SY budget = syFromMerge
   const swapResult = simulateSwapExactOut(marketState, {
     direction: SwapDirection.SyToPt,
     amountOut: ptNeeded,