@bananapus/router-terminal-v6 0.0.2 → 0.0.4

package/foundry.toml

@@ -1,7 +1,7 @@
 [profile.default]
 solc = '0.8.26'
 evm_version = 'cancun'
-optimizer_runs = 100000000
+optimizer_runs = 200
 libs = ["node_modules", "lib"]
 fs_permissions = [{ access = "read-write", path = "./"}]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -17,7 +17,7 @@
     "artifacts": "source ./.env && npx sphinx artifacts --org-id 'ea165b21-7cdc-4d7b-be59-ecdd4c26bee4' --project-name 'nana-router-terminal-v6'"
   },
   "dependencies": {
-    "@bananapus/core-v6": "^0.0.4",
+    "@bananapus/core-v6": "^0.0.5",
     "@openzeppelin/contracts": "^5.2.0",
     "@uniswap/permit2": "github:Uniswap/permit2",
     "@uniswap/v3-core": "github:Uniswap/v3-core#0.8",

package/src/JBRouterTerminal.sol

@@ -71,16 +71,20 @@ contract JBRouterTerminal is
     /// @notice The default TWAP window used for auto-discovered pools.
     uint256 public constant DEFAULT_TWAP_WINDOW = 10 minutes;
 
+    /// @notice The denominator used for slippage tolerance basis points.
+    uint256 public constant SLIPPAGE_DENOMINATOR = 10_000;
+
+    //*********************************************************************//
+    // ---------------------- internal stored properties ----------------- //
+    //*********************************************************************//
+
     /// @notice The fee tiers to search when auto-discovering V3 pools, ordered by commonality.
     /// 3000 = 0.3%, 500 = 0.05%, 10000 = 1%, 100 = 0.01%.
-    uint24[4] public FEE_TIERS = [uint24(3000), uint24(500), uint24(10_000), uint24(100)];
+    uint24[4] internal _FEE_TIERS = [uint24(3000), uint24(500), uint24(10_000), uint24(100)];
 
     /// @notice The fee/tickSpacing pairings to search for V4 vanilla pools.
-    uint24[4] public V4_FEES = [uint24(3000), uint24(500), uint24(10_000), uint24(100)];
-    int24[4] public V4_TICK_SPACINGS = [int24(60), int24(10), int24(200), int24(1)];
-
-    /// @notice The denominator used for slippage tolerance basis points.
-    uint256 public constant SLIPPAGE_DENOMINATOR = 10_000;
+    uint24[4] internal _V4_FEES = [uint24(3000), uint24(500), uint24(10_000), uint24(100)];
+    int24[4] internal _V4_TICK_SPACINGS = [int24(60), int24(10), int24(200), int24(1)];
 
     //*********************************************************************//
     // ---------------- public immutable stored properties --------------- //
@@ -607,46 +611,32 @@ contract JBRouterTerminal is
     function _bestPoolLiquidity(address tokenA, address tokenB) internal view returns (uint128 bestLiquidity) {
         // Search V3.
         for (uint256 i; i < 4; i++) {
-            address poolAddr = FACTORY.getPool(tokenA, tokenB, FEE_TIERS[i]);
+            address poolAddr = FACTORY.getPool(tokenA, tokenB, _FEE_TIERS[i]);
             if (poolAddr == address(0)) continue;
 
             uint128 liquidity = IUniswapV3Pool(poolAddr).liquidity();
             if (liquidity > bestLiquidity) bestLiquidity = liquidity;
         }
 
-        // Search V4.
-        uint128 v4Best = _bestV4PoolLiquidity(tokenA, tokenB);
-        if (v4Best > bestLiquidity) bestLiquidity = v4Best;
-    }
-
-    /// @notice Find the highest liquidity across V4 vanilla pools for a token pair.
-    /// @param tokenA One token in the pair.
-    /// @param tokenB The other token in the pair.
-    /// @return bestLiquidity The highest liquidity found across V4 pools.
-    function _bestV4PoolLiquidity(address tokenA, address tokenB) internal view returns (uint128 bestLiquidity) {
-        if (address(POOL_MANAGER) == address(0)) return 0;
-
-        // Convert WETH -> address(0) for V4 native ETH representation.
-        address v4A = tokenA == address(WETH) ? address(0) : tokenA;
-        address v4B = tokenB == address(WETH) ? address(0) : tokenB;
-
-        // Sort currencies (currency0 < currency1).
-        (address sorted0, address sorted1) = v4A < v4B ? (v4A, v4B) : (v4B, v4A);
-
-        for (uint256 i; i < 4; i++) {
-            PoolKey memory key = PoolKey({
-                currency0: Currency.wrap(sorted0),
-                currency1: Currency.wrap(sorted1),
-                fee: V4_FEES[i],
-                tickSpacing: V4_TICK_SPACINGS[i],
-                hooks: IHooks(address(0))
-            });
-
-            (uint160 sqrtPriceX96,,,) = POOL_MANAGER.getSlot0(key.toId());
-            if (sqrtPriceX96 == 0) continue;
-
-            uint128 liquidity = POOL_MANAGER.getLiquidity(key.toId());
-            if (liquidity > bestLiquidity) bestLiquidity = liquidity;
+        // Search V4 — reuse _discoverV4Pool with current best.
+        PoolInfo memory v4Result = _discoverV4Pool(
+            tokenA,
+            tokenB,
+            bestLiquidity,
+            PoolInfo({
+                isV4: false,
+                v3Pool: IUniswapV3Pool(address(0)),
+                v4Key: PoolKey({
+                    currency0: Currency.wrap(address(0)),
+                    currency1: Currency.wrap(address(0)),
+                    fee: 0,
+                    tickSpacing: 0,
+                    hooks: IHooks(address(0))
+                })
+            })
+        );
+        if (v4Result.isV4) {
+            bestLiquidity = POOL_MANAGER.getLiquidity(v4Result.v4Key.toId());
         }
     }
 
@@ -986,7 +976,7 @@ contract JBRouterTerminal is
 
         // Search V3.
         for (uint256 i; i < 4; i++) {
-            address poolAddr = FACTORY.getPool(normalizedTokenIn, normalizedTokenOut, FEE_TIERS[i]);
+            address poolAddr = FACTORY.getPool(normalizedTokenIn, normalizedTokenOut, _FEE_TIERS[i]);
 
             if (poolAddr == address(0)) continue;
 
@@ -994,7 +984,17 @@ contract JBRouterTerminal is
 
             if (poolLiquidity > bestLiquidity) {
                 bestLiquidity = poolLiquidity;
-                bestPool = PoolInfo({isV4: false, v3Pool: IUniswapV3Pool(poolAddr), v4Key: _emptyPoolKey()});
+                bestPool = PoolInfo({
+                    isV4: false,
+                    v3Pool: IUniswapV3Pool(poolAddr),
+                    v4Key: PoolKey({
+                        currency0: Currency.wrap(address(0)),
+                        currency1: Currency.wrap(address(0)),
+                        fee: 0,
+                        tickSpacing: 0,
+                        hooks: IHooks(address(0))
+                    })
+                });
             }
         }
 
@@ -1030,8 +1030,8 @@ contract JBRouterTerminal is
             PoolKey memory key = PoolKey({
                 currency0: Currency.wrap(sorted0),
                 currency1: Currency.wrap(sorted1),
-                fee: V4_FEES[i],
-                tickSpacing: V4_TICK_SPACINGS[i],
+                fee: _V4_FEES[i],
+                tickSpacing: _V4_TICK_SPACINGS[i],
                 hooks: IHooks(address(0))
             });
 
@@ -1309,17 +1309,6 @@ contract JBRouterTerminal is
         PERMIT2.transferFrom(from, to, uint160(amount), token);
     }
 
-    /// @notice Returns an empty PoolKey for use in V3-only PoolInfo structs.
-    function _emptyPoolKey() internal pure returns (PoolKey memory) {
-        return PoolKey({
-            currency0: Currency.wrap(address(0)),
-            currency1: Currency.wrap(address(0)),
-            fee: 0,
-            tickSpacing: 0,
-            hooks: IHooks(address(0))
-        });
-    }
-
     //*********************************************************************//
     // ---------------------------- receive  ----------------------------- //
     //*********************************************************************//