johba/harb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Bear defaults duplicated across Optimizer and LiquidityManager (#646)

Browse source 
Extract bear-mode default values (0, 3e17, 100, 3e17) into file-level
constants in IOptimizer.sol so both Optimizer._bearDefaults() and
LiquidityManager.recenter()'s catch block reference a single source of
truth instead of independent hardcoded literals.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
openhands 2026-03-19 18:22:43 +00:00
parent 2778d6d5ba
commit d3ff2cd0bf
3 changed files with 16 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
onchain/src/IOptimizer.sol
View file

@ -10,6 +10,14 @@ struct OptimizerInput {
int256 shift; int256 shift;
} }
/// @dev Safe bear-mode defaults shared by Optimizer._bearDefaults() and
/// LiquidityManager.recenter()'s catch block. Keep all four here so
/// the two call-sites cannot silently diverge.
uint256 constant BEAR_CAPITAL_INEFFICIENCY = 0;
uint256 constant BEAR_ANCHOR_SHARE = 3e17;
uint24 constant BEAR_ANCHOR_WIDTH = 100;
uint256 constant BEAR_DISCOVERY_DEPTH = 3e17;
/** /**
* @title IOptimizer * @title IOptimizer
* @notice Minimal interface for the Optimizer contract consumed by LiquidityManager. * @notice Minimal interface for the Optimizer contract consumed by LiquidityManager.

10
onchain/src/LiquidityManager.sol
View file

@ -2,7 +2,7 @@
pragma solidity ^0.8.19; pragma solidity ^0.8.19;
import { Kraiken } from "./Kraiken.sol"; import { Kraiken } from "./Kraiken.sol";
import { IOptimizer } from "./IOptimizer.sol"; import { IOptimizer, BEAR_CAPITAL_INEFFICIENCY, BEAR_ANCHOR_SHARE, BEAR_ANCHOR_WIDTH, BEAR_DISCOVERY_DEPTH } from "./IOptimizer.sol";
import { PriceOracle } from "./abstracts/PriceOracle.sol"; import { PriceOracle } from "./abstracts/PriceOracle.sol";
import { ThreePositionStrategy } from "./abstracts/ThreePositionStrategy.sol"; import { ThreePositionStrategy } from "./abstracts/ThreePositionStrategy.sol";
import { IWETH9 } from "./interfaces/IWETH9.sol"; import { IWETH9 } from "./interfaces/IWETH9.sol";
@ -234,10 +234,10 @@ contract LiquidityManager is ThreePositionStrategy, PriceOracle {
} catch { } catch {
// Fallback to safe bear-mode defaults if optimizer fails // Fallback to safe bear-mode defaults if optimizer fails
PositionParams memory defaultParams = PositionParams({ PositionParams memory defaultParams = PositionParams({
capitalInefficiency: 0, // CI=0 proven safest capitalInefficiency: BEAR_CAPITAL_INEFFICIENCY,
anchorShare: 3e17, // 30% — defensive floor allocation anchorShare: BEAR_ANCHOR_SHARE,
anchorWidth: 100, // Max width — avoids AW 30-90 kill zone anchorWidth: BEAR_ANCHOR_WIDTH,
discoveryDepth: 3e17 // 0.3e18 discoveryDepth: BEAR_DISCOVERY_DEPTH
}); });
_setPositions(currentTick, defaultParams); _setPositions(currentTick, defaultParams);

8
onchain/src/Optimizer.sol
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity ^0.8.19; pragma solidity ^0.8.19;
import { IOptimizer, OptimizerInput } from "./IOptimizer.sol"; import { IOptimizer, OptimizerInput, BEAR_CAPITAL_INEFFICIENCY, BEAR_ANCHOR_SHARE, BEAR_ANCHOR_WIDTH, BEAR_DISCOVERY_DEPTH } from "./IOptimizer.sol";
import { Kraiken } from "./Kraiken.sol"; import { Kraiken } from "./Kraiken.sol";
import { Stake } from "./Stake.sol"; import { Stake } from "./Stake.sol";
@ -212,12 +212,10 @@ contract Optimizer is Initializable, UUPSUpgradeable, IOptimizer {
/** /**
* @notice Safe bear-mode defaults returned when calculateParams exceeds its * @notice Safe bear-mode defaults returned when calculateParams exceeds its
* gas budget or reverts. * gas budget or reverts.
* @dev Values must stay in sync with the catch block in LiquidityManager.recenter() * @dev Constants defined in IOptimizer.sol, shared with LiquidityManager.recenter().
* ({capitalInefficiency:0, anchorShare:3e17, anchorWidth:100, discoveryDepth:3e17}).
* Update both locations together if the safe defaults ever change.
*/ */
function _bearDefaults() internal pure returns (uint256 capitalInefficiency, uint256 anchorShare, uint24 anchorWidth, uint256 discoveryDepth) { function _bearDefaults() internal pure returns (uint256 capitalInefficiency, uint256 anchorShare, uint24 anchorWidth, uint256 discoveryDepth) {
return (0, 3e17, 100, 3e17); return (BEAR_CAPITAL_INEFFICIENCY, BEAR_ANCHOR_SHARE, BEAR_ANCHOR_WIDTH, BEAR_DISCOVERY_DEPTH);
} }
// ---- Normalization helpers ---- // ---- Normalization helpers ----