diff --git a/onchain/src/LiquidityManager.sol b/onchain/src/LiquidityManager.sol index 617ed78..f16d8aa 100644 --- a/onchain/src/LiquidityManager.sol +++ b/onchain/src/LiquidityManager.sol @@ -51,16 +51,19 @@ contract LiquidityManager is ThreePositionStrategy, PriceOracle { /// @notice Last recenter tick — used to determine net trade direction between recenters int24 public lastRecenterTick; - /// @notice Last recenter timestamp — rate limits open (permissionless) recenters + /// @notice Last recenter timestamp — rate limits open recenters and provides the previous + /// recenter time for TWAP interval calculations. uint256 public lastRecenterTime; /// @notice Minimum seconds between open recenters (when recenterAccess is unset) uint256 internal constant MIN_RECENTER_INTERVAL = 60; - - /// @notice Last recenter block timestamp — used to compute elapsed interval for pool TWAP oracle - uint256 public lastRecenterTimestamp; + /// @notice Target observation cardinality requested from the pool during construction + uint16 internal constant ORACLE_CARDINALITY = 100; /// @notice Emitted on each successful recenter for monitoring and indexing event Recentered(int24 indexed currentTick, bool indexed isUp); + /// @notice Emitted when pool.observe() falls back to anchor midpoint; non-zero elapsed + /// indicates degraded oracle operation rather than normal bootstrap. + event TWAPFallback(uint32 elapsed); /// @notice Custom errors error ZeroAddressInSetter(); @@ -88,7 +91,7 @@ contract LiquidityManager is ThreePositionStrategy, PriceOracle { optimizer = Optimizer(_optimizer); // Increase observation cardinality so pool.observe() has sufficient history // for TWAP calculations between recenters. - IUniswapV3Pool(PoolAddress.computeAddress(factory, poolKey)).increaseObservationCardinalityNext(100); + pool.increaseObservationCardinalityNext(ORACLE_CARDINALITY); } /// @notice Callback function for Uniswap V3 mint operations @@ -147,9 +150,8 @@ contract LiquidityManager is ThreePositionStrategy, PriceOracle { require(block.timestamp >= lastRecenterTime + MIN_RECENTER_INTERVAL, "recenter cooldown"); require(_isPriceStable(currentTick), "price deviated from oracle"); } - uint256 prevTimestamp = lastRecenterTimestamp; + uint256 prevTimestamp = lastRecenterTime; lastRecenterTime = block.timestamp; - lastRecenterTimestamp = block.timestamp; // Check if price movement is sufficient for recentering isUp = false; @@ -283,7 +285,6 @@ contract LiquidityManager is ThreePositionStrategy, PriceOracle { /// @return priceX96 Price in Q96 format (price * 2^96) function _getTWAPOrFallback(uint256 prevTimestamp, int24 tickLower, int24 tickUpper) internal - view returns (uint256 priceX96) { // Only attempt TWAP when there is a measurable elapsed interval @@ -293,10 +294,13 @@ contract LiquidityManager is ThreePositionStrategy, PriceOracle { secondsAgos[0] = elapsed; secondsAgos[1] = 0; try pool.observe(secondsAgos) returns (int56[] memory tickCumulatives, uint160[] memory) { - int24 twapTick = int24((tickCumulatives[1] - tickCumulatives[0]) / int56(int32(elapsed))); + int24 twapTick = int24((tickCumulatives[1] - tickCumulatives[0]) / int56(uint56(elapsed))); return _priceAtTick(token0isWeth ? -1 * twapTick : twapTick); } catch { - // Observation history not deep enough — fall through to anchor midpoint + // pool.observe() failed — emit event so monitoring can distinguish + // degraded oracle operation from normal bootstrap (elapsed == 0). + emit TWAPFallback(elapsed); + // Fall through to anchor midpoint } } // Fallback: anchor midpoint (original single-snapshot behaviour) diff --git a/onchain/test/VWAPFloorProtection.t.sol b/onchain/test/VWAPFloorProtection.t.sol index df1bbaa..eb0d9bb 100644 --- a/onchain/test/VWAPFloorProtection.t.sol +++ b/onchain/test/VWAPFloorProtection.t.sol @@ -222,7 +222,7 @@ contract VWAPFloorProtectionTest is UniSwapHelper { * not merely the last-swap anchor midpoint. * * Sequence: - * 1. First recenter → positions set, no fees (lastRecenterTimestamp = t0). + * 1. First recenter → positions set, no fees (lastRecenterTime = t0). * 2. Warp 100 s → buy KRK: price moves UP, observation written at t0+100. * 3. Warp 100 s → buy KRK again: price moves further UP, observation at t0+200. * 4. Warp 100 s → bootstrap recenter (cumulativeVolume==0 → always records). @@ -240,8 +240,9 @@ contract VWAPFloorProtectionTest is UniSwapHelper { // we track elapsed time with a local variable. // Step 1: initial recenter — places positions at the pool's current price. - // No fees yet; lastRecenterTimestamp is set to block.timestamp. + // No fees yet; lastRecenterTime is set to block.timestamp. (, int24 initialTick,,,,,) = pool.slot0(); + assertFalse(token0isWeth, "test assumes token0isWeth=false"); vm.prank(RECENTER_CALLER); lm.recenter(); @@ -261,10 +262,7 @@ contract VWAPFloorProtectionTest is UniSwapHelper { // Capture the current (elevated) tick after two rounds of buying. (, int24 elevatedTick,,,,,) = pool.slot0(); - - // The price must have risen — sanity check for !token0isWeth ordering. // For !token0isWeth: buying KRK increases the tick (KRK price in WETH rises). - assertFalse(token0isWeth, "test assumes token0isWeth=false"); assertGt(elevatedTick, initialTick, "price must have risen after buys"); // Step 4: advance 100 s then do the bootstrap recenter. @@ -272,44 +270,22 @@ contract VWAPFloorProtectionTest is UniSwapHelper { // elapsed = 300 s → pool.observe([300, 0]) → TWAP tick ≈ avg of three 100-s periods. t += 100; vm.warp(t); // t = 301 - uint256 vwapBefore = lm.getVWAP(); vm.prank(RECENTER_CALLER); - try lm.recenter() { - uint256 vwapAfter = lm.getVWAP(); + lm.recenter(); - // If fees were collected, VWAP was updated. - if (vwapAfter > 0 && vwapAfter != vwapBefore) { - // TWAP over the 300-s window reflects higher prices than the initial anchor tick. - // The initial anchor was placed at `initialTick` (before any buys). - // TWAP tick ≈ (initialTick·100 + midTick·100 + elevatedTick·100) / 300 > initialTick. - // Correspondingly, priceX96(TWAP) > priceX96(initialTick). - // - // Compute a reference: the price at the initial anchor tick. - // For !token0isWeth, _priceAtTick uses the tick directly (no negation). - // We approximate it via TickMath: sqrtRatio² >> 96. - uint160 sqrtAtInitial = uint160(uint256(TickMath.getSqrtRatioAtTick(initialTick))); - uint256 initialPriceX96 = uint256(sqrtAtInitial) * uint256(sqrtAtInitial) >> 96; + // TWAP over the 300-s window reflects higher prices than the initial anchor tick. + // TWAP tick ≈ (initialTick·100 + midTick·100 + elevatedTick·100) / 300 > initialTick. + // Correspondingly, priceX96(TWAP) > priceX96(initialTick). + // + // Compute a reference: the price at the initial anchor tick. + // For !token0isWeth, _priceAtTick uses the tick directly (no negation). + // We approximate it via TickMath: sqrtRatio² >> 96. + uint256 vwapAfter = lm.getVWAP(); + assertGt(vwapAfter, 0, "VWAP must be bootstrapped after fees from two large buys"); - assertGt( - vwapAfter, - initialPriceX96, - "TWAP VWAP must exceed initial-anchor-midpoint price" - ); - } else if (lm.cumulativeVolume() == 0) { - // No ETH fees collected: ethFee == 0 so _recordVolumeAndPrice was skipped. - // This can happen when feeDestination receives all fees before recording. - // Accept the result as long as VWAP is still 0 (nothing recorded yet). - assertEq(vwapAfter, 0, "VWAP still zero when no ETH fees collected"); - } - } catch (bytes memory reason) { - // Only "amplitude not reached" is an acceptable failure — it means the second - // recenter couldn't detect sufficient price movement relative to the first one. - assertEq( - keccak256(reason), - keccak256(abi.encodeWithSignature("Error(string)", "amplitude not reached.")), - "unexpected revert in bootstrap recenter" - ); - } + uint160 sqrtAtInitial = uint160(uint256(TickMath.getSqrtRatioAtTick(initialTick))); + uint256 initialPriceX96 = uint256(sqrtAtInitial) * uint256(sqrtAtInitial) >> 96; + assertGt(vwapAfter, initialPriceX96, "TWAP VWAP must exceed initial-anchor-midpoint price"); } // =========================================================================