@bananapus/router-terminal-v6 0.0.22 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bananapus/router-terminal-v6",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "@bananapus/address-registry-v6": "^0.0.16",
-    "@bananapus/core-v6": "^0.0.28",
-    "@bananapus/permission-ids-v6": "^0.0.14",
+    "@bananapus/core-v6": "^0.0.30",
+    "@bananapus/permission-ids-v6": "^0.0.15",
     "@openzeppelin/contracts": "^5.6.1",
     "@uniswap/permit2": "github:Uniswap/permit2",
     "@uniswap/v3-core": "github:Uniswap/v3-core#0.8",

package/script/Deploy.s.sol

@@ -62,32 +62,38 @@ contract DeployScript is Script, Sphinx {
         } else if (block.chainid == 10) {
             weth = 0x4200000000000000000000000000000000000006;
             factory = 0x1F98431c8aD98523631AE4a59f267346ea31F984;
-            poolManager = 0x000000000004444c5dc75cB358380D2e3dE08A90;
+            // https://docs.uniswap.org/contracts/v4/deployments
+            poolManager = 0x9a13F98Cb987694C9F086b1F5eB990EeA8264Ec3;
             // Base Mainnet
         } else if (block.chainid == 8453) {
             weth = 0x4200000000000000000000000000000000000006;
             factory = 0x33128a8fC17869897dcE68Ed026d694621f6FDfD;
-            poolManager = 0x000000000004444c5dc75cB358380D2e3dE08A90;
+            // https://docs.uniswap.org/contracts/v4/deployments
+            poolManager = 0x498581fF718922c3f8e6A244956aF099B2652b2b;
             // Optimism Sepolia
         } else if (block.chainid == 11_155_420) {
             weth = 0x4200000000000000000000000000000000000006;
             factory = 0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24;
-            poolManager = 0xE03A1074c86CFeDd5C142C4F04F1a1536e203543;
+            // https://docs.uniswap.org/contracts/v4/deployments
+            poolManager = 0x1390B1276c3C0dd59E0e666d4cF97e30267E72E0;
             // BASE Sepolia
         } else if (block.chainid == 84_532) {
             weth = 0x4200000000000000000000000000000000000006;
             factory = 0x4752ba5DBc23f44D87826276BF6Fd6b1C372aD24;
-            poolManager = 0xE03A1074c86CFeDd5C142C4F04F1a1536e203543;
+            // https://docs.uniswap.org/contracts/v4/deployments
+            poolManager = 0x05E73354cFDd6745C338b50BcFDfA3Aa6fA03408;
             // Arbitrum Mainnet
         } else if (block.chainid == 42_161) {
             weth = 0x82aF49447D8a07e3bd95BD0d56f35241523fBab1;
             factory = 0x1F98431c8aD98523631AE4a59f267346ea31F984;
-            poolManager = 0x000000000004444c5dc75cB358380D2e3dE08A90;
+            // https://docs.uniswap.org/contracts/v4/deployments
+            poolManager = 0x360E68faCcca8cA495c1B759Fd9EEe466db9FB32;
             // Arbitrum Sepolia
         } else if (block.chainid == 421_614) {
             weth = 0x980B62Da83eFf3D4576C647993b0c1D7faf17c73;
             factory = 0x248AB79Bbb9bC29bB72f7Cd42F17e054Fc40188e;
-            poolManager = 0xE03A1074c86CFeDd5C142C4F04F1a1536e203543;
+            // https://docs.uniswap.org/contracts/v4/deployments
+            poolManager = 0xFB3e0C6F74eB1a21CC1Da29aeC80D2Dfe6C9a317;
         } else {
             revert("Invalid RPC / no juice contracts deployed on this network");
         }

package/src/JBRouterTerminal.sol

@@ -543,9 +543,18 @@ contract JBRouterTerminal is
 
             (uint256 sourceProjectId, uint256 creditAmount) = abi.decode(creditData, (uint256, uint256));
 
-            // Pull credits from the payer (requires payer to have granted TRANSFER_CREDITS to this contract).
+            // Resolve the actual credit holder. When called via an intermediary (e.g. JBRouterTerminalRegistry),
+            // _msgSender() is the intermediary — use its originalPayer to find the true holder.
+            address holder = _msgSender();
+            if (msg.sender.code.length > 0) {
+                try IJBPayerTracker(msg.sender).originalPayer() returns (address payer) {
+                    if (payer != address(0)) holder = payer;
+                } catch {}
+            }
+
+            // Pull credits from the holder (requires holder to have granted TRANSFER_CREDITS to this contract).
             TOKENS.transferCreditsFrom({
-                holder: _msgSender(), projectId: sourceProjectId, recipient: address(this), count: creditAmount
+                holder: holder, projectId: sourceProjectId, recipient: address(this), count: creditAmount
             });
 
             return creditAmount;
@@ -678,6 +687,8 @@ contract JBRouterTerminal is
             // This propagates slippage protection through multi-hop cashouts instead of dropping it.
             if (minTokensReclaimed != 0 && previousExpectedAmount != 0) {
                 minTokensReclaimed = mulDiv(minTokensReclaimed, amount, previousExpectedAmount);
+                // minTokensReclaimed may round to 0 here — that is intentional.
+                // A 0 minimum is valid and means no slippage protection for this hop.
             }
 
             // Update for next iteration.
@@ -1400,26 +1411,33 @@ contract JBRouterTerminal is
         returns (uint256 minAmountOut)
     {
         PoolId id = key.toId();
+
+        // The tick used for quoting — prefer TWAP over spot for MEV resistance.
         int24 tick;
+
+        // Track whether the oracle hook provided a TWAP so we know whether to fall back to spot.
         bool usedTwap;
 
-        // Try to use TWAP from the pool's oracle hook (if available) for manipulation resistance.
+        // If the pool has a hook, try querying it as a geomean oracle (e.g., JBUniswapV4Hook implements this).
         if (address(key.hooks) != address(0)) {
+            // Build the two-element lookback array: [_TWAP_WINDOW seconds ago, now].
             uint32[] memory secondsAgos = new uint32[](2);
-            secondsAgos[0] = _TWAP_WINDOW;
-            secondsAgos[1] = 0;
+            secondsAgos[0] = _TWAP_WINDOW; // Start of the window (30 seconds ago).
+            secondsAgos[1] = 0; // End of the window (current block).
+
+            // Ask the hook for cumulative tick data over the window. Silently catch if it doesn't support it.
             // slither-disable-next-line unused-return
             try IGeomeanOracle(address(key.hooks)).observe(key, secondsAgos) returns (
                 int56[] memory tickCumulatives, uint160[] memory
             ) {
-                // Compute the arithmetic mean tick from the TWAP window.
+                // Derive the arithmetic mean tick: (cumulative_now - cumulative_start) / elapsed_seconds.
                 // forge-lint: disable-next-line(unsafe-typecast)
                 tick = int24((tickCumulatives[1] - tickCumulatives[0]) / int56(int32(_TWAP_WINDOW)));
                 usedTwap = true;
             } catch {}
         }
 
-        // Fall back to spot price if TWAP was not available.
+        // If no TWAP was available (no hook, or hook doesn't implement observe), use the instantaneous spot tick.
         if (!usedTwap) {
             // slither-disable-next-line unused-return
             (, tick,,) = _getSlot0(id);
@@ -1509,6 +1527,12 @@ contract JBRouterTerminal is
 
         if (exists) {
             (minAmountOut) = abi.decode(quote, (uint256));
+        }
+
+        // Treat a decoded value of 0 the same as "not provided" so that a stale or default-zero quote
+        // does not silently disable slippage protection. Fall through to automatic quoting.
+        if (minAmountOut != 0) {
+            // User-provided quote is valid; skip automatic quoting.
         } else if (pool.isV4) {
             minAmountOut = _getV4SpotQuote({
                 key: pool.v4Key,
@@ -1601,6 +1625,8 @@ contract JBRouterTerminal is
             // Scale the minimum proportionally for the next step based on the actual cashout ratio.
             if (minTokensReclaimed != 0 && previousExpectedAmount != 0) {
                 minTokensReclaimed = mulDiv(minTokensReclaimed, amount, previousExpectedAmount);
+                // minTokensReclaimed may round to 0 here — that is intentional.
+                // A 0 minimum is valid and means no slippage protection for this hop.
             }
 
             // Continue previewing from the token reclaimed in this hop.