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

fix: Remove dead Optimizer V2/V3 — Push3 is the active optimizer (#312)

Browse source 
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
openhands 2026-02-26 14:20:11 +00:00
parent 1e5ac0de80
commit e925538309
9 changed files with 23 additions and 736 deletions
Download patch file Download diff file Expand all files Collapse all files

10
onchain/script/DeployBase.sol
View file

@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
import "../src/Kraiken.sol";
import { LiquidityManager } from "../src/LiquidityManager.sol";
import "../src/OptimizerV3.sol";
import "../src/OptimizerV3Push3.sol";
import "../src/Stake.sol";
import "../src/helpers/UniswapHelpers.sol";
import { ERC1967Proxy } from "@openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";
@ -71,14 +71,14 @@ contract DeployBase is Script {
console.log("Pool initialized");
}
// Deploy OptimizerV3 (if not already deployed)
// Deploy OptimizerV3Push3 (if not already deployed)
address optimizerAddress;
if (optimizer == address(0)) {
OptimizerV3 optimizerImpl = new OptimizerV3();
OptimizerV3Push3 optimizerImpl = new OptimizerV3Push3();
bytes memory params = abi.encodeWithSignature("initialize(address,address)", address(kraiken), address(stake));
ERC1967Proxy proxy = new ERC1967Proxy(address(optimizerImpl), params);
optimizerAddress = address(proxy);
console.log("OptimizerV3 deployed at:", optimizerAddress);
console.log("OptimizerV3Push3 deployed at:", optimizerAddress);
} else {
optimizerAddress = optimizer;
console.log("Using existing optimizer at:", optimizerAddress);
@ -99,7 +99,7 @@ contract DeployBase is Script {
console.log("Stake:", address(stake));
console.log("Pool:", address(pool));
console.log("LiquidityManager:", address(liquidityManager));
console.log("OptimizerV3:", optimizerAddress);
console.log("OptimizerV3Push3:", optimizerAddress);
console.log("\nPost-deploy steps:");
console.log(" 1. Fund LiquidityManager with ETH");
console.log(" 2. Set recenterAccess to txnBot: lm.setRecenterAccess(txnBot) from feeDestination");

2
onchain/script/DeployBaseMainnet.sol
View file

@ -17,7 +17,7 @@ contract DeployBaseMainnet is DeployBase {
weth = 0x4200000000000000000000000000000000000006; // WETH on Base
v3Factory = 0x33128a8fC17869897dcE68Ed026d694621f6FDfD; // Uniswap V3 Factory on Base
// Deploy fresh OptimizerV3 (UUPS proxy)
// Deploy fresh OptimizerV3Push3 (UUPS proxy)
optimizer = address(0);
}
}

10
onchain/script/DeployLocal.sol
View file

@ -4,7 +4,7 @@ pragma solidity ^0.8.19;
import "../src/Kraiken.sol";
import { LiquidityManager } from "../src/LiquidityManager.sol";
import "../src/OptimizerV3.sol";
import "../src/OptimizerV3Push3.sol";
import "../src/Stake.sol";
import "../src/helpers/UniswapHelpers.sol";
import { ERC1967Proxy } from "@openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";
@ -86,12 +86,12 @@ contract DeployLocal is Script {
console.log(" Pool initialized at 1 cent price");
}
// Deploy OptimizerV3
OptimizerV3 optimizerImpl = new OptimizerV3();
// Deploy OptimizerV3Push3
OptimizerV3Push3 optimizerImpl = new OptimizerV3Push3();
bytes memory params = abi.encodeWithSignature("initialize(address,address)", address(kraiken), address(stake));
ERC1967Proxy proxy = new ERC1967Proxy(address(optimizerImpl), params);
address optimizerAddress = address(proxy);
console.log("\n[4/6] OptimizerV3 deployed:", optimizerAddress);
console.log("\n[4/6] OptimizerV3Push3 deployed:", optimizerAddress);
// Deploy LiquidityManager
liquidityManager = new LiquidityManager(v3Factory, weth, address(kraiken), optimizerAddress);
@ -112,7 +112,7 @@ contract DeployLocal is Script {
console.log("Stake:", address(stake));
console.log("Pool:", address(pool));
console.log("LiquidityManager:", address(liquidityManager));
console.log("OptimizerV3:", optimizerAddress);
console.log("OptimizerV3Push3:", optimizerAddress);
console.log("\n=== Next Steps ===");
console.log("1. Fund LiquidityManager with ETH:");

21
onchain/script/UpgradeOptimizer.sol
View file

@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-3.0-or-later
pragma solidity ^0.8.19;
import "../src/OptimizerV3.sol";
import "../src/OptimizerV3Push3.sol";
import { UUPSUpgradeable } from "@openzeppelin/proxy/utils/UUPSUpgradeable.sol";
import "forge-std/Script.sol";
@ -28,22 +28,19 @@ contract UpgradeOptimizer is Script {
console.log("Proxy address:", proxyAddress);
console.log("Admin (sender):", sender);
// Deploy new OptimizerV3 implementation
OptimizerV3 newImpl = new OptimizerV3();
console.log("New OptimizerV3 implementation:", address(newImpl));
// Deploy new OptimizerV3Push3 implementation
OptimizerV3Push3 newImpl = new OptimizerV3Push3();
console.log("New OptimizerV3Push3 implementation:", address(newImpl));
// Upgrade proxy to new implementation (no reinitialize needed — storage layout compatible)
UUPSUpgradeable(proxyAddress).upgradeTo(address(newImpl));
console.log("Proxy upgraded to OptimizerV3");
console.log("Proxy upgraded to OptimizerV3Push3");
// Verify upgrade by calling getLiquidityParams through the proxy
OptimizerV3 upgraded = OptimizerV3(proxyAddress);
(uint256 ci, uint256 as_, uint24 aw, uint256 dd) = upgraded.getLiquidityParams();
// Verify upgrade by calling isBullMarket through the proxy
OptimizerV3Push3 upgraded = OptimizerV3Push3(proxyAddress);
bool bull = upgraded.isBullMarket(0, 0);
console.log("\n=== Post-Upgrade Verification ===");
console.log("capitalInefficiency:", ci);
console.log("anchorShare:", as_);
console.log("anchorWidth:", uint256(aw));
console.log("discoveryDepth:", dd);
console.log("isBullMarket(0,0):", bull);
vm.stopBroadcast();
}