@skate-org/amm-evm-v2 1.0.0 → 2.0.0-alpha.2

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @skate-org/amm-evm-v2
 
+## 2.0.0-alpha.2 — 2026-05-05
+
+Plan C of the SVM/Sui integration. Adds `@skate-org/amm-sui-v2` to
+the workspace; this package's source is unchanged versus
+`2.0.0-alpha.1` (re-versioned in lockstep).
+
+## 2.0.0-alpha.1 — 2026-05-05
+
+Plan B of the SVM/Sui integration. Adds `@skate-org/amm-svm-v2` to
+the workspace; this package's source is unchanged versus
+`2.0.0-alpha.0` (re-versioned in lockstep).
+
+## 2.0.0-alpha.0 — 2026-05-05
+
+Plan A of the SVM/Sui integration.
+
+- **Breaking:** uniswap-v3 math no longer ships from
+  `@skate-org/amm-evm-v2`. Import from `@skate-org/amm-core-v2`
+  instead. All function names unchanged. Top-level barrel re-exports
+  via the umbrella (`@skate-org/amm-v2`) continue to work without
+  callsite changes.
+- Removed: `packages/evm/src/math/` directory and corresponding
+  tests (relocated to `core`).
+
 ## 1.0.0 — 2026-05-04
 
 Realigning all four `@skate-org/amm-*-v2` packages at a single version

package/dist/index.cjs

@@ -24,30 +24,13 @@ __export(index_exports, {
   EvmReadError: () => EvmReadError,
   EvmWriteError: () => EvmWriteError,
   KERNEL_EVENT_NAMES: () => KERNEL_EVENT_NAMES,
-  MAX_SQRT_RATIO: () => MAX_SQRT_RATIO,
-  MAX_TICK: () => MAX_TICK,
-  MIN_SQRT_RATIO: () => MIN_SQRT_RATIO,
-  MIN_TICK: () => MIN_TICK,
   PERIPHERY_EVENT_NAMES: () => PERIPHERY_EVENT_NAMES,
-  addDelta: () => addDelta,
   computePositionAmounts: () => computePositionAmounts,
   createDevConfig: () => createDevConfig,
   decodeTickBitmapWord: () => decodeTickBitmapWord,
-  getAmount0Delta: () => getAmount0Delta,
-  getAmount0DeltaSigned: () => getAmount0DeltaSigned,
-  getAmount1Delta: () => getAmount1Delta,
-  getAmount1DeltaSigned: () => getAmount1DeltaSigned,
   getKernelPublicClient: () => getKernelPublicClient,
-  getNextSqrtPriceFromAmount0RoundingUp: () => getNextSqrtPriceFromAmount0RoundingUp,
-  getNextSqrtPriceFromAmount1RoundingDown: () => getNextSqrtPriceFromAmount1RoundingDown,
-  getNextSqrtPriceFromInput: () => getNextSqrtPriceFromInput,
-  getNextSqrtPriceFromOutput: () => getNextSqrtPriceFromOutput,
   getSourcePublicClient: () => getSourcePublicClient,
-  getSqrtRatioAtTick: () => getSqrtRatioAtTick,
-  getTickAtSqrtRatio: () => getTickAtSqrtRatio,
   megaethChain: () => megaethChain,
-  mulDiv: () => mulDiv,
-  mulDivRoundingUp: () => mulDivRoundingUp,
   parseKernelEventLog: () => parseKernelEventLog,
   parsePeripheryEventLog: () => parsePeripheryEventLog,
   readPeripheryPool: () => readPeripheryPool,
@@ -176,350 +159,6 @@ function wrapWriteError(err, functionName) {
   return new EvmWriteError(functionName, message, { cause: err });
 }
 
-// src/math/tickMath.ts
-var MAX_UINT256 = (1n << 256n) - 1n;
-var Q160_MASK = (1n << 160n) - 1n;
-var Q256_MOD = 1n << 256n;
-var MIN_TICK = -887272;
-var MAX_TICK = 887272;
-var MIN_SQRT_RATIO = 4295128739n;
-var MAX_SQRT_RATIO = 1461446703485210103287273052203988822378723970342n;
-function getSqrtRatioAtTick(tick) {
-  if (!Number.isInteger(tick)) {
-    throw new Error("TickMath: tick must be an integer");
-  }
-  const absTick = BigInt(tick < 0 ? -tick : tick);
-  if (absTick > BigInt(MAX_TICK)) {
-    throw new Error("T");
-  }
-  let ratio = (absTick & 0x1n) !== 0n ? 0xfffcb933bd6fad37aa2d162d1a594001n : 0x100000000000000000000000000000000n;
-  if ((absTick & 0x2n) !== 0n)
-    ratio = (ratio * 0xfff97272373d413259a46990580e213an & MAX_UINT256) >> 128n;
-  if ((absTick & 0x4n) !== 0n)
-    ratio = (ratio * 0xfff2e50f5f656932ef12357cf3c7fdccn & MAX_UINT256) >> 128n;
-  if ((absTick & 0x8n) !== 0n)
-    ratio = (ratio * 0xffe5caca7e10e4e61c3624eaa0941cd0n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x10n) !== 0n)
-    ratio = (ratio * 0xffcb9843d60f6159c9db58835c926644n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x20n) !== 0n)
-    ratio = (ratio * 0xff973b41fa98c081472e6896dfb254c0n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x40n) !== 0n)
-    ratio = (ratio * 0xff2ea16466c96a3843ec78b326b52861n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x80n) !== 0n)
-    ratio = (ratio * 0xfe5dee046a99a2a811c461f1969c3053n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x100n) !== 0n)
-    ratio = (ratio * 0xfcbe86c7900a88aedcffc83b479aa3a4n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x200n) !== 0n)
-    ratio = (ratio * 0xf987a7253ac413176f2b074cf7815e54n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x400n) !== 0n)
-    ratio = (ratio * 0xf3392b0822b70005940c7a398e4b70f3n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x800n) !== 0n)
-    ratio = (ratio * 0xe7159475a2c29b7443b29c7fa6e889d9n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x1000n) !== 0n)
-    ratio = (ratio * 0xd097f3bdfd2022b8845ad8f792aa5825n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x2000n) !== 0n)
-    ratio = (ratio * 0xa9f746462d870fdf8a65dc1f90e061e5n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x4000n) !== 0n)
-    ratio = (ratio * 0x70d869a156d2a1b890bb3df62baf32f7n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x8000n) !== 0n)
-    ratio = (ratio * 0x31be135f97d08fd981231505542fcfa6n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x10000n) !== 0n)
-    ratio = (ratio * 0x9aa508b5b7a84e1c677de54f3e99bc9n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x20000n) !== 0n)
-    ratio = (ratio * 0x5d6af8dedb81196699c329225ee604n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x40000n) !== 0n)
-    ratio = (ratio * 0x2216e584f5fa1ea926041bedfe98n & MAX_UINT256) >> 128n;
-  if ((absTick & 0x80000n) !== 0n)
-    ratio = (ratio * 0x48a170391f7dc42444e8fa2n & MAX_UINT256) >> 128n;
-  if (tick > 0) ratio = MAX_UINT256 / ratio;
-  const shifted = ratio >> 32n;
-  const remainder = ratio & (1n << 32n) - 1n;
-  const sqrtPriceX96 = remainder === 0n ? shifted : shifted + 1n;
-  return sqrtPriceX96 & Q160_MASK;
-}
-function getTickAtSqrtRatio(sqrtPriceX96) {
-  if (sqrtPriceX96 < MIN_SQRT_RATIO || sqrtPriceX96 >= MAX_SQRT_RATIO) {
-    throw new Error("R");
-  }
-  const ratio = sqrtPriceX96 << 32n;
-  let r = ratio;
-  let msb = 0n;
-  {
-    const f = r > 0xffffffffffffffffffffffffffffffffn ? 128n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0xffffffffffffffffn ? 64n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0xffffffffn ? 32n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0xffffn ? 16n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0xffn ? 8n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0xfn ? 4n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0x3n ? 2n : 0n;
-    msb |= f;
-    r >>= f;
-  }
-  {
-    const f = r > 0x1n ? 1n : 0n;
-    msb |= f;
-  }
-  if (msb >= 128n) r = ratio >> msb - 127n;
-  else r = ratio << 127n - msb & MAX_UINT256;
-  const offset = msb - 128n;
-  let log_2 = offset << 64n & MAX_UINT256;
-  for (let i = 0; i < 14; i++) {
-    r = r * r >> 127n;
-    const f = r >> 128n;
-    log_2 |= f << BigInt(63 - i);
-    r >>= f;
-  }
-  const log_2_signed = toInt256(log_2);
-  const log_sqrt10001 = log_2_signed * 255738958999603826347141n;
-  const tickLowBig = log_sqrt10001 - 3402992956809132418596140100660247210n >> 128n;
-  const tickHiBig = log_sqrt10001 + 291339464771989622907027621153398088495n >> 128n;
-  const tickLow = toInt24(tickLowBig);
-  const tickHi = toInt24(tickHiBig);
-  if (tickLow === tickHi) return tickLow;
-  return getSqrtRatioAtTick(tickHi) <= sqrtPriceX96 ? tickHi : tickLow;
-}
-function toInt256(x) {
-  const masked = x & MAX_UINT256;
-  return masked >= 1n << 255n ? masked - Q256_MOD : masked;
-}
-function toInt24(x) {
-  const mask = (1n << 24n) - 1n;
-  const truncated = x & mask;
-  const signed = truncated >= 1n << 23n ? truncated - (1n << 24n) : truncated;
-  return Number(signed);
-}
-
-// src/math/fullMath.ts
-var MAX_UINT2562 = (1n << 256n) - 1n;
-function mulDiv(a, b, denom) {
-  if (denom === 0n) {
-    throw new Error("FullMath: division by zero");
-  }
-  if (a < 0n || b < 0n || denom < 0n) {
-    throw new Error("FullMath: negative input");
-  }
-  const product = a * b;
-  const result = product / denom;
-  if (result > MAX_UINT2562) {
-    throw new Error("FullMath: result overflows uint256");
-  }
-  return result;
-}
-function mulDivRoundingUp(a, b, denom) {
-  if (denom === 0n) {
-    throw new Error("FullMath: division by zero");
-  }
-  if (a < 0n || b < 0n || denom < 0n) {
-    throw new Error("FullMath: negative input");
-  }
-  const product = a * b;
-  const quotient = product / denom;
-  if (quotient > MAX_UINT2562) {
-    throw new Error("FullMath: result overflows uint256");
-  }
-  if (product % denom !== 0n) {
-    if (quotient === MAX_UINT2562) {
-      throw new Error("FullMath: rounding up overflows uint256");
-    }
-    return quotient + 1n;
-  }
-  return quotient;
-}
-
-// src/math/sqrtPriceMath.ts
-var MAX_UINT128 = (1n << 128n) - 1n;
-var MAX_UINT160 = (1n << 160n) - 1n;
-var MAX_UINT2563 = (1n << 256n) - 1n;
-var Q96_RESOLUTION = 96n;
-var Q96 = 1n << 96n;
-function assertUint160(x, name) {
-  if (x < 0n || x > MAX_UINT160) {
-    throw new Error(`SqrtPriceMath: ${name} out of uint160 range`);
-  }
-}
-function assertUint128(x, name) {
-  if (x < 0n || x > MAX_UINT128) {
-    throw new Error(`SqrtPriceMath: ${name} out of uint128 range`);
-  }
-}
-function assertUint256(x, name) {
-  if (x < 0n || x > MAX_UINT2563) {
-    throw new Error(`SqrtPriceMath: ${name} out of uint256 range`);
-  }
-}
-function divRoundingUp(x, y) {
-  if (y === 0n) throw new Error("SqrtPriceMath: div by zero");
-  return x / y + (x % y === 0n ? 0n : 1n);
-}
-function toUint160(x) {
-  if (x > MAX_UINT160) throw new Error("SqrtPriceMath: toUint160 overflow");
-  return x;
-}
-function getNextSqrtPriceFromAmount0RoundingUp(sqrtPX96, liquidity, amount, add) {
-  assertUint160(sqrtPX96, "sqrtPX96");
-  assertUint128(liquidity, "liquidity");
-  assertUint256(amount, "amount");
-  if (amount === 0n) return sqrtPX96;
-  const numerator1 = liquidity << Q96_RESOLUTION;
-  if (add) {
-    const product = amount * sqrtPX96 & MAX_UINT2563;
-    const noOverflow = amount === 0n || product / amount === sqrtPX96;
-    if (noOverflow) {
-      const denominator = numerator1 + product;
-      if (denominator >= numerator1) {
-        return toUint160(mulDivRoundingUp(numerator1, sqrtPX96, denominator));
-      }
-    }
-    if (sqrtPX96 === 0n) throw new Error("SqrtPriceMath: sqrtPX96 == 0");
-    const denom = numerator1 / sqrtPX96 + amount;
-    return toUint160(divRoundingUp(numerator1, denom));
-  } else {
-    const product = amount * sqrtPX96 & MAX_UINT2563;
-    const noOverflow = amount === 0n || product / amount === sqrtPX96;
-    if (!noOverflow || numerator1 <= product) {
-      throw new Error("SqrtPriceMath: getNextSqrtPriceFromAmount0 denom <= 0");
-    }
-    const denominator = numerator1 - product;
-    return toUint160(mulDivRoundingUp(numerator1, sqrtPX96, denominator));
-  }
-}
-function getNextSqrtPriceFromAmount1RoundingDown(sqrtPX96, liquidity, amount, add) {
-  assertUint160(sqrtPX96, "sqrtPX96");
-  assertUint128(liquidity, "liquidity");
-  assertUint256(amount, "amount");
-  if (add) {
-    const quotient = amount <= MAX_UINT160 ? (amount << Q96_RESOLUTION) / liquidity : mulDiv(amount, Q96, liquidity);
-    return toUint160(sqrtPX96 + quotient);
-  } else {
-    const quotient = amount <= MAX_UINT160 ? divRoundingUp(amount << Q96_RESOLUTION, liquidity) : mulDivRoundingUp(amount, Q96, liquidity);
-    if (sqrtPX96 <= quotient) {
-      throw new Error("SqrtPriceMath: sqrtPX96 <= quotient");
-    }
-    return sqrtPX96 - quotient;
-  }
-}
-function getNextSqrtPriceFromInput(sqrtPX96, liquidity, amountIn, zeroForOne) {
-  if (sqrtPX96 <= 0n) throw new Error("SqrtPriceMath: sqrtPX96 must be > 0");
-  if (liquidity <= 0n)
-    throw new Error("SqrtPriceMath: liquidity must be > 0");
-  return zeroForOne ? getNextSqrtPriceFromAmount0RoundingUp(sqrtPX96, liquidity, amountIn, true) : getNextSqrtPriceFromAmount1RoundingDown(
-    sqrtPX96,
-    liquidity,
-    amountIn,
-    true
-  );
-}
-function getNextSqrtPriceFromOutput(sqrtPX96, liquidity, amountOut, zeroForOne) {
-  if (sqrtPX96 <= 0n) throw new Error("SqrtPriceMath: sqrtPX96 must be > 0");
-  if (liquidity <= 0n)
-    throw new Error("SqrtPriceMath: liquidity must be > 0");
-  return zeroForOne ? getNextSqrtPriceFromAmount1RoundingDown(
-    sqrtPX96,
-    liquidity,
-    amountOut,
-    false
-  ) : getNextSqrtPriceFromAmount0RoundingUp(
-    sqrtPX96,
-    liquidity,
-    amountOut,
-    false
-  );
-}
-function getAmount0Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity, roundUp) {
-  assertUint160(sqrtRatioAX96, "sqrtRatioAX96");
-  assertUint160(sqrtRatioBX96, "sqrtRatioBX96");
-  assertUint128(liquidity, "liquidity");
-  let a = sqrtRatioAX96;
-  let b = sqrtRatioBX96;
-  if (a > b) {
-    [a, b] = [b, a];
-  }
-  if (a === 0n) throw new Error("SqrtPriceMath: sqrtRatio must be > 0");
-  const numerator1 = liquidity << Q96_RESOLUTION;
-  const numerator2 = b - a;
-  if (roundUp) {
-    return divRoundingUp(mulDivRoundingUp(numerator1, numerator2, b), a);
-  }
-  return mulDiv(numerator1, numerator2, b) / a;
-}
-function getAmount1Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity, roundUp) {
-  assertUint160(sqrtRatioAX96, "sqrtRatioAX96");
-  assertUint160(sqrtRatioBX96, "sqrtRatioBX96");
-  assertUint128(liquidity, "liquidity");
-  let a = sqrtRatioAX96;
-  let b = sqrtRatioBX96;
-  if (a > b) {
-    [a, b] = [b, a];
-  }
-  return roundUp ? mulDivRoundingUp(liquidity, b - a, Q96) : mulDiv(liquidity, b - a, Q96);
-}
-function getAmount0DeltaSigned(sqrtRatioAX96, sqrtRatioBX96, liquidity) {
-  const INT128_MIN2 = -(1n << 127n);
-  const INT128_MAX2 = (1n << 127n) - 1n;
-  if (liquidity < INT128_MIN2 || liquidity > INT128_MAX2) {
-    throw new Error("SqrtPriceMath: liquidity out of int128 range");
-  }
-  if (liquidity < 0n) {
-    return -getAmount0Delta(sqrtRatioAX96, sqrtRatioBX96, -liquidity, false);
-  }
-  return getAmount0Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity, true);
-}
-function getAmount1DeltaSigned(sqrtRatioAX96, sqrtRatioBX96, liquidity) {
-  const INT128_MIN2 = -(1n << 127n);
-  const INT128_MAX2 = (1n << 127n) - 1n;
-  if (liquidity < INT128_MIN2 || liquidity > INT128_MAX2) {
-    throw new Error("SqrtPriceMath: liquidity out of int128 range");
-  }
-  if (liquidity < 0n) {
-    return -getAmount1Delta(sqrtRatioAX96, sqrtRatioBX96, -liquidity, false);
-  }
-  return getAmount1Delta(sqrtRatioAX96, sqrtRatioBX96, liquidity, true);
-}
-
-// src/math/liquidityMath.ts
-var MAX_UINT1282 = (1n << 128n) - 1n;
-var INT128_MAX = (1n << 127n) - 1n;
-var INT128_MIN = -(1n << 127n);
-function addDelta(x, y) {
-  if (x < 0n || x > MAX_UINT1282) {
-    throw new Error("LiquidityMath: x out of uint128 range");
-  }
-  if (y < INT128_MIN || y > INT128_MAX) {
-    throw new Error("LiquidityMath: y out of int128 range");
-  }
-  const z = x + y;
-  if (y < 0n) {
-    if (z < 0n) throw new Error("LS");
-  } else {
-    if (z > MAX_UINT1282) throw new Error("LA");
-  }
-  return z;
-}
-
 // src/kernel/reader.ts
 var import_amm_bindings = require("@skate-org/amm-bindings");
 var import_amm_core_v23 = require("@skate-org/amm-core-v2");
@@ -628,28 +267,28 @@ async function computePositionAmounts(tokenId, mode, client) {
   const c = resolveClient(mode, client);
   const position = await readPosition(tokenId, mode, c);
   const { slot0 } = await readPool(position.pool, mode, c);
-  const sqrtLower = getSqrtRatioAtTick(position.tickLower);
-  const sqrtUpper = getSqrtRatioAtTick(position.tickUpper);
+  const sqrtLower = (0, import_amm_core_v23.getSqrtRatioAtTick)(position.tickLower);
+  const sqrtUpper = (0, import_amm_core_v23.getSqrtRatioAtTick)(position.tickUpper);
   if (slot0.tick < position.tickLower) {
     return {
-      amount0: getAmount0Delta(sqrtLower, sqrtUpper, position.liquidity, false),
+      amount0: (0, import_amm_core_v23.getAmount0Delta)(sqrtLower, sqrtUpper, position.liquidity, false),
       amount1: 0n
     };
   }
   if (slot0.tick >= position.tickUpper) {
     return {
       amount0: 0n,
-      amount1: getAmount1Delta(sqrtLower, sqrtUpper, position.liquidity, false)
+      amount1: (0, import_amm_core_v23.getAmount1Delta)(sqrtLower, sqrtUpper, position.liquidity, false)
     };
   }
   return {
-    amount0: getAmount0Delta(
+    amount0: (0, import_amm_core_v23.getAmount0Delta)(
       slot0.sqrtPriceX96,
       sqrtUpper,
       position.liquidity,
       false
     ),
-    amount1: getAmount1Delta(
+    amount1: (0, import_amm_core_v23.getAmount1Delta)(
       sqrtLower,
       slot0.sqrtPriceX96,
       position.liquidity,
@@ -956,30 +595,13 @@ function watchPeripheryEvents(client, address, opts) {
   EvmReadError,
   EvmWriteError,
   KERNEL_EVENT_NAMES,
-  MAX_SQRT_RATIO,
-  MAX_TICK,
-  MIN_SQRT_RATIO,
-  MIN_TICK,
   PERIPHERY_EVENT_NAMES,
-  addDelta,
   computePositionAmounts,
   createDevConfig,
   decodeTickBitmapWord,
-  getAmount0Delta,
-  getAmount0DeltaSigned,
-  getAmount1Delta,
-  getAmount1DeltaSigned,
   getKernelPublicClient,
-  getNextSqrtPriceFromAmount0RoundingUp,
-  getNextSqrtPriceFromAmount1RoundingDown,
-  getNextSqrtPriceFromInput,
-  getNextSqrtPriceFromOutput,
   getSourcePublicClient,
-  getSqrtRatioAtTick,
-  getTickAtSqrtRatio,
   megaethChain,
-  mulDiv,
-  mulDivRoundingUp,
   parseKernelEventLog,
   parsePeripheryEventLog,
   readPeripheryPool,