autowrap; sendAmounts() restored

src/PartyPool.sol

@@ -17,6 +17,7 @@ import {Proxy} from "../lib/openzeppelin-contracts/contracts/proxy/Proxy.sol";
 import {ReentrancyGuard} from "../lib/openzeppelin-contracts/contracts/utils/ReentrancyGuard.sol";
 import {SafeERC20} from "../lib/openzeppelin-contracts/contracts/token/ERC20/utils/SafeERC20.sol";
 import {IERC3156FlashLender} from "../lib/openzeppelin-contracts/contracts/interfaces/IERC3156FlashLender.sol";
+import {IWETH9} from "./IWETH9.sol";
 
 /// @title PartyPool - LMSR-backed multi-asset pool with LP ERC20 token
 /// @notice A multi-asset liquidity pool backed by the LMSRStabilized pricing model.
@@ -36,6 +37,8 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
     using LMSRStabilized for LMSRStabilized.State;
     using SafeERC20 for IERC20;
 
+    function wrapperToken() external view returns (IWETH9) { return WRAPPER_TOKEN; }
+
     /// @notice Liquidity parameter κ (Q64.64) used by the LMSR kernel: b = κ * S(q)
     /// @dev Pool is constructed with a fixed κ. Clients that previously passed tradeFrac/targetSlippage
     ///      should use LMSRStabilized.computeKappaFromSlippage(...) to derive κ and pass it here.
@@ -104,9 +107,13 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
         uint256 flashFeePpm_,
         uint256 protocolFeePpm_,             // NEW: protocol share of fees (ppm)
         address protocolFeeAddress_,         // NEW: recipient for collected protocol tokens
+        IWETH9 wrapperToken_,
         PartyPoolSwapImpl swapImpl_,
         PartyPoolMintImpl mintImpl_
-    ) ERC20External(name_, symbol_) {
+    )
+    PartyPoolBase(wrapperToken_)
+    ERC20External(name_, symbol_)
+    {
         require(tokens_.length > 1, "Pool: need >1 asset");
         require(tokens_.length == bases_.length, "Pool: lengths mismatch");
         tokens = tokens_;
@@ -198,7 +205,6 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
        Swaps
        ---------------------- */
 
-/*
     function swapAmounts(
         uint256 inputTokenIndex,
         uint256 outputTokenIndex,
@@ -208,7 +214,6 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
         (uint256 grossIn, uint256 outUint,,,, uint256 feeUint) = _quoteSwapExactIn(inputTokenIndex, outputTokenIndex, maxAmountIn, limitPrice);
         return (grossIn, outUint, feeUint);
     }
-*/
 
     /// @inheritdoc IPartyPool
     function swap(
@@ -219,7 +224,7 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
         uint256 maxAmountIn,
         int128 limitPrice,
         uint256 deadline
-    ) external nonReentrant returns (uint256 amountIn, uint256 amountOut, uint256 fee) {
+    ) external payable nonReentrant returns (uint256 amountIn, uint256 amountOut, uint256 fee) {
         require(deadline == 0 || block.timestamp <= deadline, "swap: deadline exceeded");
 
         // Compute amounts using the same path as views
@@ -230,15 +235,15 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
         IERC20 tokenIn = tokens[inputTokenIndex];
         IERC20 tokenOut = tokens[outputTokenIndex];
 
-        // Transfer tokens in
-        tokenIn.safeTransferFrom(payer, address(this), totalTransferAmount);
+        // Transfer tokens in via centralized helper
+        _receiveTokenFrom(payer, tokenIn, totalTransferAmount);
 
         // Compute on-chain balances as: onchain = cached + owed (+/- transfer)
         uint256 balIAfter = cachedUintBalances[inputTokenIndex] + protocolFeesOwed[inputTokenIndex] + totalTransferAmount;
         uint256 balJAfter = cachedUintBalances[outputTokenIndex] + protocolFeesOwed[outputTokenIndex] - amountOutUint;
 
-        // Transfer output to receiver
-        tokenOut.safeTransfer(receiver, amountOutUint);
+        // Transfer output to receiver via centralized helper
+        _sendTokenTo(tokenOut, receiver, amountOutUint);
 
         // Accrue protocol share (floor) from the fee on input token
         if (PROTOCOL_FEE_PPM > 0 && feeUint > 0) {
@@ -260,6 +265,8 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
 
         emit Swap(payer, receiver, tokenIn, tokenOut, totalTransferAmount, amountOutUint);
 
+        _refund();
+
         return (totalTransferAmount, amountOutUint, feeUint);
     }
 
@@ -324,7 +331,7 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
         uint256 outputTokenIndex,
         int128 limitPrice,
         uint256 deadline
-    ) external returns (uint256 amountInUsed, uint256 amountOut, uint256 fee) {
+    ) external payable returns (uint256 amountInUsed, uint256 amountOut, uint256 fee) {
         bytes memory data = abi.encodeWithSelector(
             PartyPoolSwapImpl.swapToLimit.selector,
             payer,
@@ -355,7 +362,7 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
         uint256 inputTokenIndex,
         uint256 maxAmountIn,
         uint256 deadline
-    ) external returns (uint256 lpMinted) {
+    ) external payable returns (uint256 lpMinted) {
         bytes memory data = abi.encodeWithSelector(
             PartyPoolMintImpl.swapMint.selector,
             payer,
@@ -431,9 +438,9 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
             }
         }
 
-        token.safeTransfer(address(receiver), amount);
+        _sendTokenTo(token, address(receiver), amount);
         require(receiver.onFlashLoan(msg.sender, address(token), amount, fee, data) == FLASH_CALLBACK_SUCCESS);
-        token.safeTransferFrom(address(receiver), address(this), amount + fee);
+        _receiveTokenFrom(address(receiver), token, amount + fee);
 
         // Update cached balance for the borrowed token
         uint256 balAfter = token.balanceOf(address(this));
@@ -458,8 +465,8 @@ contract PartyPool is PartyPoolBase, ERC20External, IPartyPool {
             uint256 bal = IERC20(tokens[i]).balanceOf(address(this));
             require(bal >= owed, "collect: fee > bal");
             protocolFeesOwed[i] = 0;
-            // transfer owed tokens to protocol destination
-            tokens[i].safeTransfer(dest, owed);
+            // transfer owed tokens to protocol destination via centralized helper
+            _sendTokenTo(tokens[i], dest, owed);
             // update cached to effective onchain minus owed
             cachedUintBalances[i] = bal - owed;
         }