Hyperliquid surge hook

.prettierrc.json

@@ -12,7 +12,7 @@
       "options": {
         "singleQuote": false,
         "tabWidth": 4,
-        "compiler": "0.8.24"
+        "compiler": "0.8.26"
       }
     },
     {

pkg/pool-hooks/contracts/hooks-quantamm/LPNFT.sol

@@ -4,33 +4,27 @@ pragma solidity >=0.8.24;
 import "@openzeppelin/contracts/token/ERC721/ERC721.sol";
 import "./UpliftOnlyExample.sol";
 
-/** 
+/**
  * @notice This contract is a simple ERC721 contract for LP NFTs. It overrides update which means
  * that the deposits can be transferred feely between users.
  * this does require the router to change the vault balances and deposit records as well
  */
 
-/// @title LPNFT contract for QuantAMM LP NFTs 
-/// @notice implements ERC721 for LP NFTs 
+/// @title LPNFT contract for QuantAMM LP NFTs
+/// @notice implements ERC721 for LP NFTs
 contract LPNFT is ERC721 {
-
     uint256 numMinted;
 
     /// @notice the address of the QuantAMM router this token is for
     UpliftOnlyExample public router;
 
     /// @notice Modifier for only allowing the router to call certain functions
     modifier onlyUpliftOnlyRouter() {
-        require(msg.sender == address(router), "ROUTERONLY"); 
+        require(msg.sender == address(router), "ROUTERONLY");
         _;
     }
 
-
-    constructor(
-        string memory _name,
-        string memory _symbol,
-        address _router
-    ) ERC721(_name, _symbol) {
+    constructor(string memory _name, string memory _symbol, address _router) ERC721(_name, _symbol) {
         router = UpliftOnlyExample(payable(_router));
     }
 
@@ -47,7 +41,7 @@ contract LPNFT is ERC721 {
 
     /// @inheritdoc ERC721
     function _update(address to, uint256 tokenId, address auth) internal override returns (address previousOwner) {
-        previousOwner  = super._update(to, tokenId, auth);
+        previousOwner = super._update(to, tokenId, auth);
         //_update is called during mint, burn and transfer. This functionality is only for transfer
         if (to != address(0) && previousOwner != address(0)) {
             //if transfering the record in the vault needs to be changed to reflect the change in ownership

pkg/pool-hooks/contracts/test/HardhatImports.sol

@@ -16,8 +16,9 @@ import { RateProviderMock } from "@balancer-labs/v3-vault/contracts/test/RatePro
 
 import { WETHTestToken } from "@balancer-labs/v3-solidity-utils/contracts/test/WETHTestToken.sol";
 
-import { WeightedPool } from "@balancer-labs/v3-pool-weighted/contracts/WeightedPool.sol";
 import { WeightedPoolFactory } from "@balancer-labs/v3-pool-weighted/contracts/WeightedPoolFactory.sol";
+import { WeightedPoolMock } from "@balancer-labs/v3-pool-weighted/contracts/test/WeightedPoolMock.sol";
+import { WeightedPool } from "@balancer-labs/v3-pool-weighted/contracts/WeightedPool.sol";
 
 import { StablePool } from "@balancer-labs/v3-pool-stable/contracts/StablePool.sol";
 import { StablePoolFactory } from "@balancer-labs/v3-pool-stable/contracts/StablePoolFactory.sol";

pkg/pool-hooks/contracts/test/HyperSurgeHookMock.sol

@@ -34,12 +34,12 @@ contract HyperSurgeHookMock is HyperSurgeHook {
     }
 
     function PairSpotFromBalancesWeights(
-        uint256 bIn,
-        uint256 wIn,
-        uint256 bOut,
-        uint256 wOut
+        uint256[] memory balancesScaled18,
+        uint256[] memory weights,
+        uint256 indexTokenIn,
+        uint256 indexTokenOut
     ) external pure returns (uint256) {
-        return _pairSpotFromBalancesWeights(bIn, wIn, bOut, wOut);
+        return _pairSpotFromBalancesWeights(balancesScaled18, weights, indexTokenIn, indexTokenOut);
     }
 
     function RelAbsDiff(uint256 a, uint256 b) external pure returns (uint256) {
@@ -51,14 +51,17 @@ contract HyperSurgeHookMock is HyperSurgeHook {
     }
 
     function EnsureValidPct(uint256 pct) external pure {
-        _ensureValidPct(pct);
+        _ensureValidPercentage(pct);
     }
 
     function ComputeSurgeFee(
-        ComputeSurgeFeeLocals memory locals,
         PoolSwapParams calldata p,
-        uint256 staticSwapFee
+        PoolDetails memory poolDetails,
+        uint256 staticSwapFee,
+        uint256[] memory weights,
+        uint256 calculatedAmountScaled18,
+        uint256 oraclePrice
     ) external pure returns (bool ok, uint256 surgeFee) {
-        return _computeSurgeFee(locals, p, staticSwapFee);
+        return _computeSurgeFee(p, poolDetails, staticSwapFee, weights, calculatedAmountScaled18, oraclePrice);
     }
 }

pkg/pool-hooks/test/foundry/HyperSurgeAdmin.t.sol

@@ -999,70 +999,6 @@ contract HyperSurgeAdminTest is BaseVaultTest, HyperSurgeHookDeployer, WeightedP
         assertEq(hook.getCapDeviationPercentage(address(pool), IHyperSurgeHook.TradeType.ARBITRAGE), 1e18);
     }
 
-    function testFuzz_onRegister_RevertWhenTokenCountBelowTwo(
-        uint8 n,
-        uint256 defaultThreshold,
-        uint256 defaultMaxFee,
-        uint256 defaultCap
-    ) public {
-        n = uint8(bound(n, 0, 1));
-        defaultThreshold = bound(defaultThreshold, 1, 1e9 - 1);
-        defaultCap = bound(defaultCap, defaultThreshold + 1, 1e9);
-        defaultMaxFee = bound(defaultMaxFee, 1, 1e9);
-
-        defaultThreshold *= 1e9;
-        defaultCap *= 1e9;
-        defaultMaxFee *= 1e9;
-
-        HyperSurgeHookMock h = new HyperSurgeHookMock(
-            IVault(vault),
-            defaultMaxFee,
-            defaultThreshold,
-            defaultCap,
-            "test"
-        );
-
-        TokenConfig[] memory cfgs = new TokenConfig[](n);
-        LiquidityManagement memory lm;
-
-        vm.startPrank(address(vault));
-        vm.expectRevert(HyperSurgeHook.NumTokensOutOfRange.selector);
-        h.onRegister(address(0), address(0), cfgs, lm);
-        vm.stopPrank();
-    }
-
-    function testFuzz_onRegister_RevertWhenTokenCountAboveEight(
-        uint256 n,
-        uint256 defaultThreshold,
-        uint256 defaultMaxFee,
-        uint256 defaultCap
-    ) public {
-        n = bound(n, 9, type(uint8).max);
-        defaultThreshold = bound(defaultThreshold, 1, 1e9 - 1);
-        defaultCap = bound(defaultCap, defaultThreshold + 1, 1e9);
-        defaultMaxFee = bound(defaultMaxFee, 1, 1e9);
-
-        defaultThreshold *= 1e9;
-        defaultCap *= 1e9;
-        defaultMaxFee *= 1e9;
-
-        HyperSurgeHookMock h = new HyperSurgeHookMock(
-            IVault(vault),
-            defaultMaxFee,
-            defaultThreshold,
-            defaultCap,
-            "test"
-        );
-
-        TokenConfig[] memory cfgs = new TokenConfig[](n);
-        LiquidityManagement memory lm;
-
-        vm.startPrank(address(vault));
-        vm.expectRevert(HyperSurgeHook.NumTokensOutOfRange.selector);
-        h.onRegister(address(0), address(0), cfgs, lm);
-        vm.stopPrank();
-    }
-
     function test_getHookFlags_SignalsAreSet(
         uint256 defaultThreshold,
         uint256 defaultMaxFee,