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

package/build/withdrawLiquidity.js

@@ -1,9 +1,74 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPtAndSyOnWithdrawLiquidity = getPtAndSyOnWithdrawLiquidity;
-const utils_1 = require("./utils");
+const PRECISE_NUMBER_DENOM = 1000000000000n;
+const SENTINEL_TICK_INDEX = 0xffffffff;
+const invariantError = (message) => new Error(`WithdrawLiquidityInvariantViolated: ${message}`);
+const getTickByIndex = (ticks, tickIdx) => {
+    const tick = ticks.ticksTree[tickIdx - 1];
+    if (!tick || tick.apyBasePoints <= 0) {
+        throw invariantError(`missing tick at index ${tickIdx}`);
+    }
+    return tick;
+};
+const getTickKey = (ticks, tickIdx) => getTickByIndex(ticks, tickIdx).apyBasePoints;
+const successorIdx = (ticks, tickIdx) => {
+    const tickKey = getTickKey(ticks, tickIdx);
+    let best = 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 splitSuccessorForEpoch = (ticks, leftIdx, rightIdx, splitEpoch) => {
+    let cursor = successorIdx(ticks, leftIdx);
+    while (cursor != null && cursor !== SENTINEL_TICK_INDEX && cursor !== rightIdx) {
+        const tick = getTickByIndex(ticks, cursor);
+        if (tick.splitParentIdx === leftIdx && tick.splitParentEpoch === splitEpoch) {
+            return cursor;
+        }
+        cursor = successorIdx(ticks, cursor);
+    }
+    return null;
+};
+const fastMulRatioRaw = (rawPreciseNumber, numerator, denominator) => {
+    if (denominator <= 0n) {
+        throw invariantError("fastMulRatio denominator is zero");
+    }
+    if (numerator === 0n || rawPreciseNumber === 0n) {
+        return 0n;
+    }
+    if (numerator === denominator) {
+        return rawPreciseNumber;
+    }
+    const q = rawPreciseNumber / denominator;
+    const r = rawPreciseNumber % denominator;
+    return q * numerator + (r * numerator) / denominator;
+};
+const numberFromRatioRaw = (numerator, denominator) => {
+    if (denominator <= 0n) {
+        throw invariantError("Number::from_ratio denominator is zero");
+    }
+    return (numerator * PRECISE_NUMBER_DENOM) / denominator;
+};
+const mulNumberRaw = (leftRaw, rightRaw) => (leftRaw * rightRaw) / PRECISE_NUMBER_DENOM;
+const principalOutForBurn = (principal, burnShares, shareSupply) => {
+    if (principal === 0n || burnShares === 0n || shareSupply === 0n) {
+        return 0n;
+    }
+    if (burnShares >= shareSupply) {
+        return principal;
+    }
+    const out = (principal * burnShares) / shareSupply;
+    return out < principal ? out : principal;
+};
 function projectAnchorSharesToCurrentTicks(ticks, rootShares) {
-    const SENTINEL = 0xffffffff; // Sentinel value for tree traversal (matches Rust implementation)
     // Deep clone the trackers to avoid mutating the original objects (important for React Query caching)
     const stack = rootShares.map((s) => ({
         tickIdx: s.tickIdx,
@@ -15,61 +80,50 @@ function projectAnchorSharesToCurrentTicks(ticks, rootShares) {
     const newShares = []; // This will hold the leaf shares
     while (stack.length > 0) {
         const principalShare = stack.pop();
-        // Find the tick node for this share
-        const tickNode = ticks.ticksTree.at(principalShare.tickIdx - 1) ?? null;
-        if (!tickNode) {
-            //? Tick node not found for tickIdx
-            continue;
-        }
+        const tickNode = getTickByIndex(ticks, principalShare.tickIdx);
         const lastSplitEpoch = tickNode.lastSplitEpoch;
         // Check if we need to split this share (if the tick has been split since this share was created)
         if (principalShare.splitEpoch < lastSplitEpoch) {
             const rightIndex = principalShare.rightTickIdx;
-            if (rightIndex !== SENTINEL) {
-                // Find the successor tick (the split point)
-                const splitedIndex = (0, utils_1.getSuccessorTickIdxByIdx)(ticks, principalShare.tickIdx);
-                if (splitedIndex === null) {
-                    //? No successor tick found for splitting
-                    continue;
-                }
-                const tickSpotPrice = tickNode.impliedRate;
-                const rightTickNode = ticks.ticksTree.at(rightIndex - 1) ?? null;
-                const splitedTickNode = ticks.ticksTree.at(splitedIndex - 1) ?? null;
-                if (!rightTickNode || !splitedTickNode) {
-                    //? Could not find right or split tick nodes
-                    continue;
-                }
-                // Calculate the proportions based on spot price ranges
-                const splitedFullRange = rightTickNode.impliedRate - tickSpotPrice;
-                const currentSplitRange = splitedTickNode.impliedRate - tickSpotPrice;
-                // Calculate how much LP share goes to the left portion
-                const leftShare = Math.floor(Number(principalShare.lpShare) * (currentSplitRange / splitedFullRange));
-                // Create new emission trackers with staged reset to 0
-                const newEmissions = principalShare.emissions.map((tracker) => ({
-                    staged: 0n,
-                    lastSeenIndex: tracker.lastSeenIndex,
-                }));
-                // Calculate the migrated share (right portion)
-                const migratedShare = principalShare.lpShare - BigInt(leftShare);
-                // Update the current share to be the left portion
-                principalShare.lpShare = BigInt(leftShare);
-                principalShare.rightTickIdx = splitedIndex;
-                // Push the right portion back onto the stack for further processing
-                stack.push({
-                    tickIdx: splitedIndex,
-                    rightTickIdx: rightIndex,
-                    splitEpoch: principalShare.splitEpoch,
-                    lpShare: migratedShare,
-                    emissions: newEmissions,
-                });
-                // Update the split epoch to mark this share as processed
-                principalShare.splitEpoch = lastSplitEpoch;
+            if (rightIndex === SENTINEL_TICK_INDEX) {
+                throw invariantError("no right index for split range");
             }
-            else {
-                // Error: we have a split range but no right index
-                //? No right index for split range
-                continue;
+            const splitedIndex = splitSuccessorForEpoch(ticks, principalShare.tickIdx, rightIndex, principalShare.splitEpoch);
+            if (splitedIndex == null) {
+                throw invariantError("no split successor for parent epoch");
             }
+            const tickSpotPrice = tickNode.impliedRate;
+            const rightTickNode = getTickByIndex(ticks, rightIndex);
+            const splitedTickNode = getTickByIndex(ticks, splitedIndex);
+            const splitedFullRange = rightTickNode.impliedRate - tickSpotPrice;
+            const currentSplitRange = splitedTickNode.impliedRate - tickSpotPrice;
+            const [leftShare, migratedShare] = splitedFullRange <= 0
+                ? [0n, principalShare.lpShare]
+                : (() => {
+                    const ratio = Math.max(0, Math.min(1, currentSplitRange / splitedFullRange));
+                    const scaledNum = BigInt(Math.round(ratio * Number(PRECISE_NUMBER_DENOM)));
+                    const rightScaledNum = PRECISE_NUMBER_DENOM - scaledNum;
+                    return [
+                        fastMulRatioRaw(principalShare.lpShare, scaledNum, PRECISE_NUMBER_DENOM),
+                        fastMulRatioRaw(principalShare.lpShare, rightScaledNum, PRECISE_NUMBER_DENOM),
+                    ];
+                })();
+            const newEmissions = principalShare.emissions.map((tracker) => ({
+                staged: 0n,
+                lastSeenIndex: tracker.lastSeenIndex,
+            }));
+            principalShare.lpShare = leftShare;
+            principalShare.rightTickIdx = splitedIndex;
+            stack.push({
+                tickIdx: splitedIndex,
+                rightTickIdx: rightIndex,
+                splitEpoch: principalShare.splitEpoch,
+                lpShare: migratedShare,
+                emissions: newEmissions,
+            });
+            principalShare.splitEpoch += 1n;
+            stack.push(principalShare);
+            continue;
         }
         // Add the processed share to the result
         newShares.push(principalShare);
@@ -97,12 +151,7 @@ function updateLpPositionShares(marketEmissions, ticks, position) {
     // Iterate through each share and update
     for (const share of recomputedShares) {
         const myShares = share.lpShare;
-        // Find the tick node in the ticks tree
-        const tickNode = ticks.ticksTree.at(share.tickIdx - 1) ?? null;
-        if (!tickNode) {
-            //? Tick node not found for provided tickIdx
-            continue;
-        }
+        const tickNode = getTickByIndex(ticks, share.tickIdx);
         // Update tick emissions with market emission indices
         // In Rust: node_mut.value.update_tick_emissions(market_emission_indices)
         for (let i = 0; i < marketEmissionIndices.length; i++) {
@@ -148,22 +197,22 @@ function updateLpPositionShares(marketEmissions, ticks, position) {
 function calculatePtSyRemoval(position, ticks, liquidityToRemove) {
     let totalPtOut = 0n;
     let totalSyOut = 0n;
+    const isFullRemoval = liquidityToRemove === position.lpBalance;
+    if (liquidityToRemove <= 0n || liquidityToRemove > position.lpBalance) {
+        throw invariantError("invalid liquidity amount");
+    }
     for (const share of position.shareTrackers) {
         const myShares = share.lpShare;
-        const tickNode = ticks.ticksTree.at(share.tickIdx - 1) ?? null;
-        if (!tickNode) {
-            continue;
-        }
+        const tickNode = getTickByIndex(ticks, share.tickIdx);
         const supply = tickNode.principalShareSupply;
-        // Calculate burn shares: r = l_remove / pos.L
-        // burn_shares = my_shares * liquidity_to_remove / position.lp_balance
-        const burnShares = (myShares * liquidityToRemove) / position.lpBalance;
-        // Calculate PT output for this tick
-        // pt_out = principal_pt * burn_shares / supply
-        const ptOut = supply > 0n ? (tickNode.principalPt * burnShares) / supply : 0n;
-        // Calculate SY output for this tick
-        // sy_out = principal_sy * burn_shares / supply
-        const syOut = supply > 0n ? (tickNode.principalSy * burnShares) / supply : 0n;
+        const burnShares = isFullRemoval
+            ? myShares
+            : mulNumberRaw(myShares, numberFromRatioRaw(liquidityToRemove, position.lpBalance));
+        if (burnShares > supply) {
+            throw invariantError("withdraw burn shares exceed tick supply");
+        }
+        const ptOut = principalOutForBurn(tickNode.principalPt, burnShares, supply);
+        const syOut = principalOutForBurn(tickNode.principalSy, burnShares, supply);
         totalPtOut += ptOut;
         totalSyOut += syOut;
     }

package/build/withdrawLiquidity.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdrawLiquidity.js","sourceRoot":"","sources":["../src/withdrawLiquidity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"withdrawLiquidity.js","sourceRoot":"","sources":["../src/withdrawLiquidity.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exponent-labs/market-three-math",
-  "version": "0.9.16",
+  "version": "0.9.18",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "AGPL-3.0",
@@ -10,7 +10,7 @@
     "test:live": "ts-node examples/test-live-market.ts"
   },
   "dependencies": {
-    "@exponent-labs/exponent-fetcher": "0.9.16",
+    "@exponent-labs/exponent-fetcher": "0.9.18",
     "@solana/web3.js": "^1.95.8"
   },
   "devDependencies": {